thomas: server/pear/PEAR-Horde-Channel Makefile, 1.1, 1.2 PEAR-Horde-Channel.spec, 1.2, 1.3

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	Makefile PEAR-Horde-Channel.spec 
Log Message:
Fix build system for PEAR-Horde-Channel and PEAR-PHPUnit-Channel:

- use version/revision from .spec file (similar to the other PEAR packages)
- use curl instead of wget to prevent wget's magic:
  If a file to be downloaded already exists (even if old or incomplete),
  the next download is done to file.1


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 09:43:57 -0000	1.1
+++ Makefile	10 Dec 2008 15:39:11 -0000	1.2
@@ -12,8 +12,8 @@
 endif
 
 PACKAGE = PEAR-Horde-Channel
-VERSION = 1.0
-RELEASE = 1
+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
 
@@ -33,7 +33,7 @@
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget "$(SOURCE_0)"
+	cd $(KOLABRPMSRC)/$(PACKAGE) && curl -RLO "$(SOURCE_0)"
 	cp $(PACKAGE).spec $(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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Horde-Channel.spec	25 Nov 2008 22:54:32 -0000	1.2
+++ PEAR-Horde-Channel.spec	10 Dec 2008 15:39:11 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           PEAR-Horde-Channel
 Version:        1.0
-Release:        1
+Release:        20081210
 Summary:        Adds pear.horde.org channel to PEAR
 
 Group:          Development/Languages