gunnar: server/php-kolab/Kolab_Format ChangeLog, 1.3, 1.4 Kolab_Format.spec, 1.9, 1.10 Makefile, 1.6, 1.7

cvs at kolab.org cvs at kolab.org
Thu Apr 2 22:27:17 CEST 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv32113/php-kolab/Kolab_Format

Modified Files:
	ChangeLog Kolab_Format.spec Makefile 
Log Message:
        kolab/issue3520 (calendar with certain entries does not display in web
                         client)
        kolab/issue3525 (free/busy regeneration aborts for unparsable events)
        kolab/issue3528 (Events with broken encoding should work)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	12 Dec 2008 11:48:22 -0000	1.3
+++ ChangeLog	2 Apr 2009 20:27:15 -0000	1.4
@@ -1,3 +1,16 @@
+2009-04-02  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Format.spec: Update to 1.0.1.
+
+	Handle parsing errors within the DOM XML extension correctly
+	kolab/issue3520 (calendar with certain entries does not display in web client)
+	https://www.intevation.de/roundup/kolab/issue3520
+	kolab/issue3525 (free/busy regeneration aborts for unparsable events)
+	https://www.intevation.de/roundup/kolab/issue3525
+	Accept ISO-8859-1 encoding even if advertised as UTF-8
+	kolab/issue3528 (Events with broken encoding should work)
+	https://www.intevation.de/roundup/kolab/issue3528
+
 2008-12-12  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Format.spec: Update to 1.0.0.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Kolab_Format.spec	12 Dec 2008 11:48:22 -0000	1.9
+++ Kolab_Format.spec	2 Apr 2009 20:27:15 -0000	1.10
@@ -1,7 +1,8 @@
 # Variables
 %define         V_package Kolab_Format
-%define         V_version 1.0.0
-%define         V_release 20081212
+%define         V_version 1.0.1
+%define         V_release 20090402
+%define         V_sourceurl http://pear.horde.org/get
 
 # Package Information
 Name:	   %{V_package}
@@ -14,7 +15,11 @@
 Group:     Development/Libraries
 Distribution:	OpenPKG
 
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+# List of Sources
+Source:    %{V_sourceurl}/%{V_package}-%{V_version}.tgz
+
+# List of patches
+#Patch0:    issueXYZ.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -37,12 +42,16 @@
 %prep
 	%setup -n %{V_package}-%{V_version}
 
+        #%patch -p2 -P 0
+
+	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
+
 %build
 
 %install
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	12 Dec 2008 11:48:22 -0000	1.6
+++ Makefile	2 Apr 2009 20:27:15 -0000	1.7
@@ -1,40 +1,111 @@
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9RC.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+# 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
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+# 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
+
+# Determine the package name from the *.spec file
+PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
+
+# Determine the package version from the *.spec file
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+
+# Determine the release number from the *.spec file
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
+# Determine the download url for the PEAR package from the *.spec file
+SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*\(.*\)/\1/")
+
+# Get the list of patches if there are any in this directory
+PATCHES = $(shell ls *.patch 2> /dev/null)
+
+# Generate the full package name
+SOURCE_0=$(PACKAGE)-$(VERSION).tgz
+
+# Generate a list of extra files for the package
+EXTRA=ChangeLog $(PATCHES)
+
+
+# Default target to generate the source rpm package
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
+# Target for placing the source rpm in the staging area
 .PHONY: dist
 dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+	test -d $(STAGING) || mkdir $(STAGING)
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
 
-.PHONY: clean
-clean:
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
+# Target for installing the binary rpm package in our current Kolab
+# server installation
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
+# Target for retrieving the source package
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): 
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+# Target for preparing the source area and building the package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
+# Target for fetching the source rpm into the current directory
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+# Target for cleaning up the files that can be generated with this Makefile
+.PHONY: clean
+clean:
+	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf *~
+





More information about the commits mailing list