summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2009-01-19 16:35:53 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2009-01-19 16:35:53 (GMT)
commit5860a35148c0143da9cbcaf08a52c8d4196df7f4 (patch)
tree04d6f62940ba79aa46b49a2a88511af29006c53c /pear
parentec7aa29e524e0d699fd4109acc357ce238388465 (diff)
downloadserver-5860a35148c0143da9cbcaf08a52c8d4196df7f4.tar.gz
Fix Makefile and bump release number for PEAR-Horde-Channel/PEAR-PHPUnit-Channel
(fixes 'make' after the fix for kolab/issue3315)
Diffstat (limited to 'pear')
-rw-r--r--pear/PEAR-Horde-Channel/ChangeLog5
-rw-r--r--pear/PEAR-Horde-Channel/Makefile7
-rw-r--r--pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec2
-rw-r--r--pear/PEAR-PHPUnit-Channel/ChangeLog5
-rw-r--r--pear/PEAR-PHPUnit-Channel/Makefile7
-rw-r--r--pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec2
6 files changed, 18 insertions, 10 deletions
diff --git a/pear/PEAR-Horde-Channel/ChangeLog b/pear/PEAR-Horde-Channel/ChangeLog
index 0d6bd6c..60c058d 100644
--- a/pear/PEAR-Horde-Channel/ChangeLog
+++ b/pear/PEAR-Horde-Channel/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * Makefile: Fix build after kolab/issue3315.
+ * PEAR-Horde-Channel.spec: Bump release number.
+
2009-01-07 Gunnar Wrobel <p@rdus.de>
* PEAR-Horde-Channel.spec:
diff --git a/pear/PEAR-Horde-Channel/Makefile b/pear/PEAR-Horde-Channel/Makefile
index 8c6c660..c7c8fe7 100644
--- a/pear/PEAR-Horde-Channel/Makefile
+++ b/pear/PEAR-Horde-Channel/Makefile
@@ -15,7 +15,7 @@ PACKAGE = PEAR-Horde-Channel
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 @@ clean:
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
diff --git a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
index 8cd817d..98eade6 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: 20081210
+Release: 20090119
Summary: Adds pear.horde.org channel to PEAR
Group: Development/Languages
diff --git a/pear/PEAR-PHPUnit-Channel/ChangeLog b/pear/PEAR-PHPUnit-Channel/ChangeLog
index 16dab49..a670f26 100644
--- a/pear/PEAR-PHPUnit-Channel/ChangeLog
+++ b/pear/PEAR-PHPUnit-Channel/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * Makefile: Fix build after kolab/issue3315.
+ * PEAR-PHPUnit-Channel.spec: Bump release number.
+
2009-01-07 Gunnar Wrobel <p@rdus.de>
* PEAR-PHPUnit-Channel.spec:
diff --git a/pear/PEAR-PHPUnit-Channel/Makefile b/pear/PEAR-PHPUnit-Channel/Makefile
index dd3f303..6442cb8 100644
--- a/pear/PEAR-PHPUnit-Channel/Makefile
+++ b/pear/PEAR-PHPUnit-Channel/Makefile
@@ -15,7 +15,7 @@ PACKAGE = PEAR-PHPUnit-Channel
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
+EXTRA=pear.phpunit.de.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -30,11 +30,10 @@ clean:
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
diff --git a/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec b/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
index e222796..2aabf5f 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: 20081012
+Release: 20090119
Summary: Adds pear.phpunit.de channel to PEAR
Group: Development/Languages