thomas: server/kolab-webclient ChangeLog, 1.10.2.23, 1.10.2.24 Makefile, 1.6.2.5, 1.6.2.6 kolab-webclient.spec, 1.23.2.26, 1.23.2.27

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv7910/kolab-webclient

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Makefile kolab-webclient.spec 
Log Message:
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.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/ChangeLog,v
retrieving revision 1.10.2.23
retrieving revision 1.10.2.24
diff -u -d -r1.10.2.23 -r1.10.2.24
--- ChangeLog	14 Jun 2010 06:42:28 -0000	1.10.2.23
+++ ChangeLog	25 Jun 2010 14:18:37 -0000	1.10.2.24
@@ -1,3 +1,8 @@
+2010-06-25  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* Makefile, kolab-webclient.spec: Drop +activesync3 target and
+	release value.
+
 2010-06-14  Gunnar Wrobel  <p at rdus.de>
 
 	* issue4395.patch: kolab/issue4395 (freebusy list contains

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/Makefile,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -d -r1.6.2.5 -r1.6.2.6
--- Makefile	14 Jun 2010 06:42:28 -0000	1.6.2.5
+++ Makefile	25 Jun 2010 14:18:37 -0000	1.6.2.6
@@ -66,37 +66,3 @@
 .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 .

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.26
retrieving revision 1.23.2.27
diff -u -d -r1.23.2.26 -r1.23.2.27
--- kolab-webclient.spec	24 Jun 2010 09:59:01 -0000	1.23.2.26
+++ kolab-webclient.spec	25 Jun 2010 14:18:37 -0000	1.23.2.27
@@ -3,23 +3,18 @@
 %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}
 
 #   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/