From 7550ac12ee71c3c8d75efef393e55e92b931158c Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Thu, 4 Jan 2007 11:49:53 +0000
Subject: [PATCH] - update to 1.4.11

---
 .cvsignore    |  6 ++++++
 php-pear.spec | 23 ++++++++++++++++-------
 sources       |  4 ++--
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2de6542..80e0b9a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,7 @@
 XML_RPC-1.5.0.tgz
+install-pear-nozlib-1.4.11.phar
+XML_RPC-1.5.1.tgz
+pear-1.4.11
+*.src.rpm
+noarch
+clog
diff --git a/php-pear.spec b/php-pear.spec
index e171756..60bd6b0 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -1,14 +1,14 @@
 
 %define peardir %{_datadir}/pear
 
-%define xmlrpcver 1.5.0
+%define xmlrpcver 1.5.1
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.4.9
-Release: 4
+Version: 1.4.11
+Release: 2
 Epoch: 1
-License: The PHP License 3.0
+License: The PHP License v3.0
 Group: System
 URL: http://pear.php.net/package/PEAR
 Source0: install-pear-nozlib-%{version}.phar
@@ -43,7 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 
 export PHP_PEAR_SYSCONF_DIR=`pwd`
 export PHP_PEAR_SIG_KEYDIR=/etc/pearkeys
-export PHP_PEAR_CACHE_DIR=%{_localstatedir}/cache/php-pear
+
+# 1.4.11 tries to write to the cache directory during installation
+# so it's not possible to set a sane default via the environment.
+# The ${PWD} bit will be stripped via relocate.php later.
+export PHP_PEAR_CACHE_DIR=${PWD}%{_localstatedir}/cache/php-pear
+export PHP_PEAR_TEMP_DIR=/var/tmp
 
 %{_bindir}/php -n -dshort_open_tag=0 -dsafe_mode=0 \
          -derror_reporting=E_ALL -ddetect_unicode=0 \
@@ -73,7 +78,8 @@ sed -si "s,$RPM_BUILD_ROOT,,g" \
          $RPM_BUILD_ROOT%{peardir}/*/*/*.php
 
 # Sanitize the pear.conf
-%{_bindir}/php -n %{SOURCE2} pear.conf $RPM_BUILD_ROOT > new-pear.conf
+%{_bindir}/php -n %{SOURCE2} pear.conf $RPM_BUILD_ROOT | 
+  %{_bindir}/php -n %{SOURCE2} php://stdin $PWD > new-pear.conf
 %{_bindir}/php -n %{SOURCE3} new-pear.conf ext_dir > $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
 
 for f in $RPM_BUILD_ROOT%{peardir}/.registry/*.reg; do
@@ -90,7 +96,7 @@ install -m 644 -c $RPM_SOURCE_DIR/macros.pear \
 # Check that no buildroot-relative or arch-specific paths are left in the pear.conf
 grep $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
 grep %{_libdir} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
-grep /tmp $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
+grep '"/tmp"' $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,6 +112,9 @@ rm pear.conf
 %doc LICENSE
 
 %changelog
+* Thu Jan  4 2007 Joe Orton <jorton@redhat.com> 1:1.4.11-2
+- update to 1.4.11
+
 * Fri Jul 14 2006 Joe Orton <jorton@redhat.com> 1:1.4.9-4
 - update to XML_RPC-1.5.0
 - really package macros.pear
diff --git a/sources b/sources
index b1a862f..8cdf92b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1030f325e0ce140db7cb3063bda52d3b  install-pear-nozlib-1.4.9.phar
-9f9205d8c8b3ca07a50c5d332c6fb722  XML_RPC-1.5.0.tgz
+b023a99f9a9cf1164ef96208206a00d1  install-pear-nozlib-1.4.11.phar
+1b516162ad65971b5fd04a7c279627ec  XML_RPC-1.5.1.tgz