rpms/php-pear/devel .cvsignore, 1.11, 1.12 php-pear.spec, 1.26, 1.27 sources, 1.11, 1.12 pear-downloaddir.patch, 1.1, NONE pear-peclinstall.patch, 1.1, NONE

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv559

Modified Files:
	.cvsignore php-pear.spec sources 
Removed Files:
	pear-downloaddir.patch pear-peclinstall.patch 
Log Message:
update to 1.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jul 2007 18:31:05 -0000	1.11
+++ .cvsignore	9 Sep 2007 19:35:42 -0000	1.12
@@ -1,4 +1,4 @@
-PEAR-1.6.1.tgz
+PEAR-1.6.2.tgz
 XML_RPC-1.5.1.tgz
 Archive_Tar-1.3.2.tgz
 Console_Getopt-1.2.3.tgz


Index: php-pear.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- php-pear.spec	21 Aug 2007 11:34:25 -0000	1.26
+++ php-pear.spec	9 Sep 2007 19:35:42 -0000	1.27
@@ -12,8 +12,8 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.6.1
-Release: 2
+Version: 1.6.2
+Release: 1%{?dist}
 Epoch: 1
 License: PHP
 Group: Development/Languages
@@ -33,13 +33,6 @@
 Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
 Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
 
-# To Avoid warnings when using pecl (un)install command
-# see  http://pear.php.net/bugs/bug.php?id=11420 
-Patch0: pear-peclinstall.patch
-# To avoid error when "system" download_dir is not writable for normal user.
-# see  http://pear.php.net/bugs/bug.php?id=11517
-Patch1: pear-downloaddir.patch
-
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-cli >= 5.1.0-1, php-xml, gnupg
@@ -63,6 +56,8 @@
     tar xzf  $archive --strip-components 1
 done
 
+# apply patches on used PEAR during install
+# -- no patch
 
 %build
 # This is an empty build section.
@@ -109,9 +104,9 @@
 install -m 644 -c %{SOURCE13} \
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear     
 
+# apply patches on installed PEAR tree
 cd $RPM_BUILD_ROOT%{peardir} 
-patch -p4 <%{PATCH0}
-patch -p4 <%{PATCH1}
+# -- no patch
 
 # Why this file here ?
 rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
@@ -139,6 +134,11 @@
 %doc LICENSE
 
 %changelog
+* Sun Sep  9 2007 Remi Collet <Fedora at FamilleCollet.com> 1:1.6.2-1
+- update to 1.6.2
+- remove patches merged upstream
+- Fix : "pear install" hangs on non default channel (#283401)
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 1:1.6.1-2
 - fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jul 2007 18:31:05 -0000	1.11
+++ sources	9 Sep 2007 19:35:42 -0000	1.12
@@ -1,4 +1,4 @@
-1476f0ec3917d68e3d7af1346a9a7b89  PEAR-1.6.1.tgz
+8658f584d0ba2648b795fe8b1d8998c2  PEAR-1.6.2.tgz
 1b516162ad65971b5fd04a7c279627ec  XML_RPC-1.5.1.tgz
 17d49e837b64df4e8f9124f829b22cd1  Archive_Tar-1.3.2.tgz
 d7618327f9302a7191893768982de823  Console_Getopt-1.2.3.tgz


--- pear-downloaddir.patch DELETED ---


--- pear-peclinstall.patch DELETED ---