SPECS (DEVEL): php-pear-PEAR.spec - updated, added rpmvars patch

[glen]

Author: glen                         Date: Sun Sep 18 14:07:34 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated, added rpmvars patch

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.65.2.12 -> 1.65.2.13) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.65.2.12 SPECS/php-pear-PEAR.spec:1.65.2.13
--- SPECS/php-pear-PEAR.spec:1.65.2.12	Sun Sep 18 15:38:52 2005
+++ SPECS/php-pear-PEAR.spec	Sun Sep 18 16:07:28 2005
@@ -11,7 +11,7 @@
 Name:		php-pear-%{_pearname}
 Version:	1.4.0
 %define		_rc RC2
-%define		_rel 0.1
+%define		_rel 0.3
 Release:	1.%{_rc}.%{_rel}
 Epoch:		1
 License:	PHP 3.0
@@ -22,6 +22,7 @@
 Patch0:		%{name}-memory.patch
 Patch1:		%{name}-sysconfdir.patch
 Patch2:		%{name}-rpmpkgname.patch
+Patch3:		%{name}-rpmvars.patch
 URL:		http://pear.php.net/package/PEAR/
 BuildRequires:	php-pear-build >= 0.3
 Requires:	php-pear >= 4:1.0-5.5
@@ -67,6 +68,7 @@
 %patch0 -p2
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,14 +77,14 @@
 
 D=%{_builddir}/%{name}-%{version}
 pearcmd() {
-	HOME=${D} php -d output_buffering=1 -d include_path=".:${D}%{php_pear_dir}" ${D}%{php_pear_dir}/pearcmd.php "$@"
+	php -d output_buffering=1 -d include_path=".:${D}%{php_pear_dir}" ${D}%{php_pear_dir}/pearcmd.php -c ${D}/pearrc "$@"
 }
 pearcmd config-set doc_dir %{_docdir} || exit
 pearcmd config-set data_dir %{php_pear_dir}/data || exit
 pearcmd config-set php_dir %{php_pear_dir} || exit
 pearcmd config-set test_dir %{php_pear_dir}/tests || exit
 pearcmd config-set sig_bin %{_bindir}/gpg || exit
-cp $D/.pearrc $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
+cp $D/pearrc $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
 
 %pear_package_install
 cp -a ./%{_bindir}/* $RPM_BUILD_ROOT%{_bindir}
@@ -106,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65.2.13  2005/09/18 14:07:28  glen
+- updated, added rpmvars patch
+
 Revision 1.65.2.12  2005/09/18 13:38:52  glen
 - updated to 1.4.0RC2 (beta)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.65.2.12&r2=1.65.2.13&f=u