thomas: server/pear/PEAR-Horde-Channel ChangeLog, 1.3, 1.4 Makefile, 1.2, 1.3 PEAR-Horde-Channel.spec, 1.6, 1.7

cvs at kolab.org cvs at kolab.org
Mon Jan 19 17:35:55 CET 2009


Author: thomas

Update of /kolabrepository/server/pear/PEAR-Horde-Channel
In directory doto:/tmp/cvs-serv1526/PEAR-Horde-Channel

Modified Files:
	ChangeLog Makefile PEAR-Horde-Channel.spec 
Log Message:
Fix Makefile and bump release number for PEAR-Horde-Channel/PEAR-PHPUnit-Channel
(fixes 'make' after the fix for kolab/issue3315)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	7 Jan 2009 19:42:42 -0000	1.3
+++ ChangeLog	19 Jan 2009 16:35:53 -0000	1.4
@@ -1,3 +1,8 @@
+2009-01-19  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* Makefile: Fix build after kolab/issue3315.
+	* PEAR-Horde-Channel.spec: Bump release number.
+
 2009-01-07  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Horde-Channel.spec:

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	10 Dec 2008 15:39:11 -0000	1.2
+++ Makefile	19 Jan 2009 16:35:53 -0000	1.3
@@ -15,7 +15,7 @@
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-SOURCE_0=http://pear.horde.org/channel.xml
+EXTRA=pear.horde.org.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -30,11 +30,10 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && curl -RLO "$(SOURCE_0)"
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 

Index: PEAR-Horde-Channel.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PEAR-Horde-Channel.spec	7 Jan 2009 19:42:42 -0000	1.6
+++ PEAR-Horde-Channel.spec	19 Jan 2009 16:35:53 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           PEAR-Horde-Channel
 Version:        1.0
-Release:        20081210
+Release:        20090119
 Summary:        Adds pear.horde.org channel to PEAR
 
 Group:          Development/Languages





More information about the commits mailing list