gunnar: server/kolab-fbview ChangeLog, 1.3, 1.4 Makefile, 1.4, 1.5 kolab-fbview.spec, 1.10, 1.11

cvs at kolab.org cvs at kolab.org
Sun Apr 26 23:27:14 CEST 2009


Author: gunnar

Update of /kolabrepository/server/kolab-fbview
In directory doto:/tmp/cvs-serv24564/kolab-fbview

Modified Files:
	ChangeLog Makefile kolab-fbview.spec 
Log Message:
        The package installation procedure was synchronized with the
        installation of the kolab-webclient.

        kolab/issue3293 (Big code duplication and code version messup: Horde
                         libs in 2.2.1)
        kolab/issue3439 (FreeBusy display in web client and fbview depends on
                         kolabHomeServer in LDAP)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	27 Dec 2008 10:46:14 -0000	1.3
+++ ChangeLog	26 Apr 2009 21:27:12 -0000	1.4
@@ -1,3 +1,15 @@
+2009-04-26  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-fbview.spec: 
+
+	The package installation procedure was synchronized with the
+	installation of the kolab-webclient.
+
+	kolab/issue3293 (Big code duplication and code version messup: Horde
+	                 libs in 2.2.1)
+	kolab/issue3439 (FreeBusy display in web client and fbview depends on
+	                 kolabHomeServer in LDAP)
+
 2008-12-27  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-fbview.spec: kolab/issue3318 (kolab-fbview-1.2.0-20081212

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	20 Nov 2008 17:46:57 -0000	1.4
+++ Makefile	26 Apr 2009 21:27:12 -0000	1.5
@@ -1,16 +1,53 @@
+# If home is unset this Makefile assumes the Kolab server installation
+# resides in /kolab. If this is not the case this Makefile must be
+# called using
+#
+# HOME="/mykolabroot" make TARGET
+#
+ifeq "x$(HOME)" "x"
+  HOME = /kolab
+endif
+
+# If HOME is set to /root it is likely that somebody is calling this
+# Makefile as root user. In this case this Makefile assumes that the
+# Kolab server installation resides in /kolab.
+#
+# In the (hopefully) unlikely event that somebody really installed the
+# Kolab server in /root this Makefile will fail.
+ifeq "x$(HOME)" "x/root"
+  HOME = /kolab
+endif
+
+# Set the location of the rpm binary
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
 endif
+
+# Set the location for rpm source package installations
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = $(HOME)/RPM/SRC
 endif
+
+# Set the location for rpm packages
 ifeq "x$(KOLABRPMPKG)" "x"
   KOLABRPMPKG = $(HOME)/RPM/PKG
 endif
+
+# Set the location for the rpm temporary directory
 ifeq "x$(KOLABRPMTMP)" "x"
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
+# Determine the suffix for binary packages on this system
+ifeq "x$(PLATTAG)" "x"
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+endif
+
+# Determine the staging area for collecting new source rpms
+ifeq "x$(STAGING)" "x"
+  STAGING = ../stage
+endif
+
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
 YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
 MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
@@ -24,7 +61,8 @@
 PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_fbview_openpkg.patch
+PATCHES_HORDE = ../kolab-webclient/patches/$(VERSION)/KOLAB
+PATCHES_FBVIEW = ./patches/$(VERSION)/FBVIEW
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -44,12 +82,23 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
+$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE_0):
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	for PATCH in $(PATCHES); do \
-	  cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
+.PHONY: $(KOLABRPMSRC)/$(PACKAGE)/series.patch
+$(KOLABRPMSRC)/$(PACKAGE)/series.patch: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE_0)
+	rm -f $(KOLABRPMSRC)/$(PACKAGE)/series.patch
+	for PATCH in `cat $(PATCHES_HORDE)/series`;                          \
+	do                                                                   \
+	  cat $(PATCHES_HORDE)/$$PATCH >> $(KOLABRPMSRC)/$(PACKAGE)/series.patch;  \
+	done
+	for PATCH in `cat $(PATCHES_FBVIEW)/series`;                         \
+	do                                                                   \
+	  cat $(PATCHES_FBVIEW)/$$PATCH >> $(KOLABRPMSRC)/$(PACKAGE)/series.patch;  \
+	done
+
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog $(KOLABRPMSRC)/$(PACKAGE)/series.patch
 
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
@@ -70,3 +119,7 @@
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm

Index: kolab-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/kolab-fbview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab-fbview.spec	19 Feb 2009 16:44:06 -0000	1.10
+++ kolab-fbview.spec	26 Apr 2009 21:27:12 -0000	1.11
@@ -1,9 +1,9 @@
 # Versions
 %define         V_horde_name horde-webmail
 %define         V_package kolab-fbview
-%define         V_year  2008
-%define         V_month 12
-%define         V_day   27
+%define         V_year  2009
+%define         V_month 04
+%define         V_day   26
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -26,7 +26,7 @@
 Source2:        fbview-kronolith-kolab-conf.template
 
 # List of Patches
-Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_fbview_openpkg.patch
+Patch0:         series.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -36,6 +36,9 @@
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
 PreReq:       kolabd
+PreReq:       Kolab_Format >= 1.0.1
+PreReq:       Kolab_Server >= 0.5.0
+PreReq:       Kolab_Storage >= 0.4.0
 
 Obsoletes:    fbview-horde, fbview-kronolith
 
@@ -51,7 +54,7 @@
 	%setup -q -c %{V_horde_name}-%{V_source_version}
 
 	cd %{V_horde_name}-%{V_source_version}
-	%patch -p1 -P 0
+	%patch -p2 -P 0
 	cd ..
 
 %build
@@ -83,6 +86,27 @@
 	cd ..
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
+
+	# 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*
+
+	# Kolab_Server is in sync
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/IMAP*
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Server*
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Session.php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Test/Server.php
+
+	# Kolab_Storage is in sync
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Deprecated.php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Storage*
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Test/Storage.php
+
 
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/storage/horde.db < scripts/sql/groupware.sql
 





More information about the commits mailing list