gunnar: server/pear/PEAR-Horde-Channel ChangeLog, 1.4, 1.5 Makefile, 1.3, 1.4 PEAR-Horde-Channel.spec, 1.7, 1.8

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Makefile PEAR-Horde-Channel.spec 
Log Message:
Prepare the channel installation for Horde 4 packages.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	19 Jan 2009 16:35:53 -0000	1.4
+++ ChangeLog	18 May 2009 17:34:04 -0000	1.5
@@ -1,3 +1,8 @@
+2009-05-18  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Horde-Channel.spec: Prepare the channel installation for
+	Horde 4 packages.
+
 2009-01-19  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* Makefile: Fix build after kolab/issue3315.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	19 Jan 2009 16:35:53 -0000	1.3
+++ Makefile	18 May 2009 17:34:04 -0000	1.4
@@ -1,15 +1,4 @@
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
+include ../Base.mk
 
 PACKAGE = PEAR-Horde-Channel
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
@@ -24,11 +13,31 @@
 dist: all
 	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
 
+# Target for installing the binary rpm package in our current Kolab
+# server installation
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+
 .PHONY: clean
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
+
+# Target for the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE):
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+
+# Target for preparing the source area and building the package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE) Makefile $(PACKAGE).spec $(EXTRA)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+# Target for fetching the source rpm into the current directory
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)

Index: PEAR-Horde-Channel.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PEAR-Horde-Channel.spec	19 Jan 2009 16:35:53 -0000	1.7
+++ PEAR-Horde-Channel.spec	18 May 2009 17:34:04 -0000	1.8
@@ -46,11 +46,20 @@
 env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
   %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-update %{pear_xmldir}/pear.horde.org.xml || \
   echo "Could not update channel pear.horde.org!" && sleep 1
+env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
+  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php-h4 channel-add    %{pear_xmldir}/pear.horde.org.xml || \
+  echo "Channel already exists!" && sleep 1
+env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
+  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php-h4 channel-update %{pear_xmldir}/pear.horde.org.xml || \
+  echo "Could not update channel pear.horde.org!" && sleep 1
   rm -rf %{l_prefix}/RPM/TMP/pear
 
 %postun
 env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
   %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-delete pear.horde.org ||                    \
+  echo "Could not delete channel pear.horde.org!" && sleep 1
+env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
+  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php-h4 channel-delete pear.horde.org ||                    \
   echo "Could not delete channel pear.horde.org!" && sleep 1
   rm -rf %{l_prefix}/RPM/TMP/pear