summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2010-06-25 14:18:37 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2010-06-25 14:18:37 (GMT)
commit58bb2e1a6f37d725ee2e2782524103000fff11a2 (patch)
treed6da6ea08b43ca92dfb790e9d50599e9b5bcfd9c
parentdbcadeda570236b8be7504b01cc5f5877c41f6b6 (diff)
downloadserver-58bb2e1a6f37d725ee2e2782524103000fff11a2.tar.gz
Drop +activesync3 release value from kolab-webclient
- dynamic release values are not supported by 00INDEX.rdf - source package is identical for the binary package compiled with or without activesync enabled Added "-D kolab-webclient::with_activesync=no" to install-kolab.sh so users can change it easily during compilation.
-rwxr-xr-xinstall-kolab.sh2
-rw-r--r--kolab-webclient/ChangeLog5
-rw-r--r--kolab-webclient/Makefile34
-rw-r--r--kolab-webclient/kolab-webclient.spec9
4 files changed, 8 insertions, 42 deletions
diff --git a/install-kolab.sh b/install-kolab.sh
index eba60dc..c6e7055 100755
--- a/install-kolab.sh
+++ b/install-kolab.sh
@@ -20,7 +20,7 @@ USER=""
PREFIX=""
PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl -D kolab-webclient::with_activesync=no"
EXCLUDEPKGS=""
#Flags
diff --git a/kolab-webclient/ChangeLog b/kolab-webclient/ChangeLog
index 50b8737..21d9e75 100644
--- a/kolab-webclient/ChangeLog
+++ b/kolab-webclient/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-25 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * Makefile, kolab-webclient.spec: Drop +activesync3 target and
+ release value.
+
2010-06-14 Gunnar Wrobel <p@rdus.de>
* issue4395.patch: kolab/issue4395 (freebusy list contains
diff --git a/kolab-webclient/Makefile b/kolab-webclient/Makefile
index 79ede45..92b6d93 100644
--- a/kolab-webclient/Makefile
+++ b/kolab-webclient/Makefile
@@ -66,37 +66,3 @@ $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERS
.PHONY: install
install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-
-.PHONY: all-activesync
-all-activesync: $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm
-
-.PHONY: dist-activesync
-dist-activesync: all-activesync
- cp $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm ../stage/
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
- test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
- cd $(KOLABRPMSRC)/$(PACKAGE) #&& wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
-
- for PATCH in $(PATCHES); do \
- cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
-
- cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
-
- if [ -n "$(TEMPLATES)" ]; then \
- for TEMPLATE in $(TEMPLATES); \
- do \
- cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
- done; \
- fi
-
- if [ -n "$(CONFIGS)" ]; then \
- for CONFIG in $(CONFIGS); \
- do \
- cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
- done; \
- fi
-
- cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_activesync yes'
-
- cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm .
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index 905421e..db9f835 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -3,11 +3,12 @@
%define V_package kolab-webclient
%define V_year 2010
%define V_month 06
-%define V_day 14
+%define V_day 25
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -15,12 +16,6 @@ Name: %{V_package}
# package options
%option with_activesync no
-%if "%{with_activesync}" == "no"
-%define V_release %{V_year}%{V_month}%{V_day}
-%else
-%define V_release %{V_year}%{V_month}%{V_day}+activesync3
-%endif
-
Summary: The Kolab Groupware web client (based on horde)
URL: http://www.kolab.org/
Packager: Gunnar Wrobel <wrobel@pardus.de> (p@rdus)