summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2008-12-10 15:39:11 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2008-12-10 15:39:11 (GMT)
commitd02c221f6e28dd44bfd6b307f59d4a687317ba6c (patch)
tree70f777f54c00c9f92c936f2d32affb165430716d /pear
parentaaa700e0a4149c0f67dd37391bd025bd6ed9fb95 (diff)
downloadserver-d02c221f6e28dd44bfd6b307f59d4a687317ba6c.tar.gz
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
Diffstat (limited to 'pear')
-rw-r--r--pear/PEAR-Horde-Channel/Makefile6
-rw-r--r--pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec2
-rw-r--r--pear/PEAR-PHPUnit-Channel/Makefile6
-rw-r--r--pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec2
4 files changed, 8 insertions, 8 deletions
diff --git a/pear/PEAR-Horde-Channel/Makefile b/pear/PEAR-Horde-Channel/Makefile
index 80a6c6b..8c6c660 100644
--- a/pear/PEAR-Horde-Channel/Makefile
+++ b/pear/PEAR-Horde-Channel/Makefile
@@ -12,8 +12,8 @@ ifeq "x$(KOLABRPMTMP)" "x"
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 @@ clean:
$(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
diff --git a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
index 69e691a..bb68d47 100644
--- a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
+++ b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
@@ -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
diff --git a/pear/PEAR-PHPUnit-Channel/Makefile b/pear/PEAR-PHPUnit-Channel/Makefile
index 4bd2152..dd3f303 100644
--- a/pear/PEAR-PHPUnit-Channel/Makefile
+++ b/pear/PEAR-PHPUnit-Channel/Makefile
@@ -12,8 +12,8 @@ ifeq "x$(KOLABRPMTMP)" "x"
endif
PACKAGE = PEAR-PHPUnit-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.phpunit.de/channel.xml
@@ -33,7 +33,7 @@ clean:
$(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
diff --git a/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec b/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
index d2b123b..5734c14 100644
--- a/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
+++ b/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
@@ -2,7 +2,7 @@
Name: PEAR-PHPUnit-Channel
Version: 1.0
-Release: 1
+Release: 20081012
Summary: Adds pear.phpunit.de channel to PEAR
Group: Development/Languages