gunnar: server/pear/PEAR-PEAR ChangeLog, 1.1, 1.1.2.1 Makefile, 1.3, 1.3.2.1 PEAR-PEAR.spec, 1.2, 1.2.2.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear/PEAR-PEAR
In directory doto:/tmp/cvs-serv17810/pear/PEAR-PEAR

Modified Files:
      Tag: kolab_2_1_branch
	ChangeLog Makefile PEAR-PEAR.spec 
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Attic/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	20 Jul 2007 15:07:47 -0000	1.1.2.1
@@ -1,3 +1,10 @@
+2007-07-20  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-PEAR.spec (BuildPreReq): Fixed PEAR dependency.
+	(Version): Updated to 1.5.4 
+
+	* Makefile (VERSION): Updated to 1.5.4 
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-PEAR.spec: Added package to Kolab CVS.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Attic/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile	11 Jul 2007 14:38:07 -0000	1.3
+++ Makefile	20 Jul 2007 15:07:47 -0000	1.3.2.1
@@ -1,7 +1,7 @@
 RPM = /kolab/bin/openpkg rpm
 NAME = PEAR-PEAR
 PACKAGE = PEAR-PEAR
-VERSION = 1.4.11
+VERSION = 1.6.1
 RELEASE = 1
 KOLABRELEASE = $(RELEASE)
 

Index: PEAR-PEAR.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Attic/PEAR-PEAR.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- PEAR-PEAR.spec	24 May 2007 14:49:40 -0000	1.2
+++ PEAR-PEAR.spec	20 Jul 2007 15:07:47 -0000	1.2.2.1
@@ -3,7 +3,7 @@
 Summary:   PEAR: PEAR Base System
 URL:       http://pear.php.net/package/PEAR
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
-Version:   1.4.11
+Version:   1.6.1
 Release:   1
 License:   PHP License
 Group:     Development/Libraries
@@ -15,8 +15,8 @@
 # Build Info
 Prefix:	   %{l_prefix}
 BuildRoot: %{l_buildroot}
-BuildPreReq:	PEAR-Archive_Tar >= 1.3.2, php
-PreReq:	        PEAR-Archive_Tar >= 1.3.2, php
+BuildPreReq:	php, php::with_pear = yes
+PreReq:	        php, php::with_pear = yes
 
 %description 
 The PEAR package contains:
@@ -54,17 +54,9 @@
 %build
 
 %install
-        PEAR_VERSION=`%{l_prefix}/bin/pear version 2>&1 | grep PEAR | sed -e 's/PEAR Version: \([0-9\.]*\).*/\1/'`
-
-	if [ $PEAR_VERSION == "1.4.11" ]; then
-          env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
-              PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	      %{l_prefix}/bin/pear install --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/PEAR-%{version}.tgz
-        else
-          env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
-              PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	      %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/PEAR-%{version}.tgz
-        fi
+        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
+            PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
+	    %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/PEAR-%{version}.tgz
 
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}