gunnar: server/kolab-webclient ChangeLog, 1.11, 1.12 Makefile, 1.7, 1.8 kolab-webclient.spec, 1.25, 1.26

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Makefile kolab-webclient.spec 
Log Message:
        Started cleanup of the code triplication. Kolab_Format is now
        completely in sync and can be removed from within the
        kolab-webclient package.

        kolab/issue3293 (Big code duplication and code version messup: Horde
                         libs in 2.2.1)
        kolab/issue3420 (web client prefs and hooks should be
                         configurable via templates)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	25 Apr 2009 21:45:04 -0000	1.11
+++ ChangeLog	25 Apr 2009 22:31:50 -0000	1.12
@@ -1,3 +1,16 @@
+2009-04-26  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec:
+
+	Started cleanup of the code triplication. Kolab_Format is now
+	completely in sync and can be removed from within the
+	kolab-webclient package.
+ 
+	kolab/issue3293 (Big code duplication and code version messup: Horde
+	                 libs in 2.2.1)
+	kolab/issue3420 (web client prefs and hooks should be
+	                 configurable via templates)
+
 2009-04-25  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/1.2.0/KOLAB/t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff:

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	25 Apr 2009 21:12:37 -0000	1.7
+++ Makefile	25 Apr 2009 22:31:51 -0000	1.8
@@ -88,7 +88,9 @@
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
 
+.PHONY: $(KOLABRPMSRC)/$(PACKAGE)/series.patch
 $(KOLABRPMSRC)/$(PACKAGE)/series.patch: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE_0)
+	rm -f $(KOLABRPMSRC)/$(PACKAGE)/series.patch
 	for PATCH in `cat $(PATCHES)/series | grep -v t_KOLAB`;              \
 	do                                                                   \
 	  cat $(PATCHES)/$$PATCH >> $(KOLABRPMSRC)/$(PACKAGE)/series.patch;  \

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- kolab-webclient.spec	25 Apr 2009 21:12:37 -0000	1.25
+++ kolab-webclient.spec	25 Apr 2009 22:31:51 -0000	1.26
@@ -77,6 +77,17 @@
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/
 
+	# The following section removes libraries again so that we
+	# only need to patch/install them once in the system.
+	#
+	# kolab/issue3293 (Big code duplication and code version messup: Horde
+        #                  libs in 2.2.1)
+
+	# Kolab_Format is in sync
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Format*
+
+
+
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql
 
 	cd ..