gunnar: server/php-kolab/Kolab_Filter package.xml, 1.4, 1.5 Kolab_Filter.spec, 1.16, 1.17 Makefile, 1.6, 1.7

cvs at kolab.org cvs at kolab.org
Thu Feb 26 17:29:13 CET 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv2319/php-kolab/Kolab_Filter

Modified Files:
	Kolab_Filter.spec Makefile 
Added Files:
	package.xml 
Log Message:
 kolab/issue3435 (Delivery of invitations fails with no kolabInvitationPolicy is in ldap)


Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Kolab_Filter.spec	24 Feb 2009 12:32:47 -0000	1.16
+++ Kolab_Filter.spec	26 Feb 2009 16:29:11 -0000	1.17
@@ -16,6 +16,10 @@
 
 # List of Sources
 Source0:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source1:    package.xml
+
+# List of patches
+Patch0:    issue3435.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -50,6 +54,8 @@
 %prep
 	%setup -n %{V_package}-%{V_version}
 
+	%patch -p3 -P 0
+	cp %{S:1} .
 %build
 
 %install
@@ -59,7 +65,8 @@
 
         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 -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
+#	    %{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/freebusy" 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}
 
 	cp $RPM_BUILD_ROOT/%{l_prefix}/lib/php/doc/Kolab_Filter/man/man1/kolabfilter.1 $RPM_BUILD_ROOT/%{l_prefix}/man/man1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	24 Feb 2009 11:57:46 -0000	1.6
+++ Makefile	26 Feb 2009 16:29:11 -0000	1.7
@@ -21,6 +21,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
+EXTRA=ChangeLog issue3435.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -40,7 +41,8 @@
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 
 $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	#cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .





More information about the commits mailing list