gunnar: server/horde/horde-framework ChangeLog, 1.7, 1.8 horde-framework-kolab.spec, 1.25, 1.26

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv17633/horde/horde-framework

Modified Files:
	ChangeLog horde-framework-kolab.spec 
Log Message:
kolab/issue2128 (Building horde-framework-kolab without http access fails)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	1 Nov 2007 10:54:52 -0000	1.7
+++ ChangeLog	8 Nov 2007 11:54:52 -0000	1.8
@@ -1,3 +1,9 @@
+2007-11-08  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-framework-kolab.spec:
+
+	Removed the pear.horde.org PEAR channel hack.
+
 2007-11-01  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-framework-kolab.spec:

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- horde-framework-kolab.spec	1 Nov 2007 10:54:52 -0000	1.25
+++ horde-framework-kolab.spec	8 Nov 2007 11:54:52 -0000	1.26
@@ -39,6 +39,7 @@
 #Pre requisites
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
+BuildPreReq:  php-channel-horde
 AutoReq:      no
 AutoReqProv:  no
 #BuildArch:    noarch
@@ -60,23 +61,13 @@
 %build
 
 %install
-	# Hack to add the necessary horde channel
-	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-discover pear.horde.org && \
-	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.horde.org   || \
-            echo "Channel already exists!" && sleep 1
-
-        #BAD, BAD hack
-	rm -rf %{l_prefix}/.pearrc
-
 	for PKG in **/package.xml; do                                                              \
            if [ "$PKG" != "Role_Webroot/package.xml" -a "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then        \
 	        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"    \
-                    PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/pear/cache"                                 \
+                    PHP_PEAR_CACHE_DIR="%{l_prefix}/RPM/TMP/pear/cache"                            \
                     %{l_prefix}/bin/pear package $PKG;                                             \
 	        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"    \
-                    PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/tmp/pear/cache"                             \
+                    PHP_PEAR_CACHE_DIR="%{l_prefix}/RPM/TMP/pear/cache"                            \
                     %{l_prefix}/bin/pear install --force --loose --nodeps --offline --packagingroot="$RPM_BUILD_ROOT" *.tgz;\
                     rm *.tgz;                                                                      \
             fi;                                                                                    \