- update to 1.4.9 (thanks to Remi Collet, #183359)

- package /usr/share/pear/.pkgxml (#190252)
- update to XML_RPC-1.4.8
- bundle the v3.0 LICENSE file

.cvsignore

@@ -1,3 +1,8 @@
 XML_RPC-1.4.4.tgz
 install-pear-nozlib-1.4.5.phar
 install-pear-nozlib-1.4.6.phar
+XML_RPC-1.4.8.tgz
+install-pear-nozlib-1.4.9.phar
+noarch
+clog
+*.src.rpm

LICENSE

@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.0
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+ 
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group@php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group@php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP, freely available from
+     <http://www.php.net/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------- 
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group@php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+This product includes the Zend Engine, freely available at
+<http://www.zend.com>.

php-pear.spec

@@ -1,27 +1,26 @@
 
 %define peardir %{_datadir}/pear
 
-%define xmlrpcver 1.4.4
+%define xmlrpcver 1.4.8
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.4.6
+Version: 1.4.9
 Release: 2
 Epoch: 1
-License: PHP
+License: The PHP License 3.0
 Group: System
 URL: http://pear.php.net/package/PEAR
 Source0: install-pear-nozlib-%{version}.phar
 Source2: relocate.php
 Source3: strip.php
+Source4: LICENSE
 Source10: pear.sh
 Source11: pecl.sh
 Source12: peardev.sh
-Source20: XML_RPC-%{xmlrpcver}.tgz
+Source20: http://pear.php.net/get/XML_RPC-%{xmlrpcver}.tgz
-Patch0: php-pear-1.4.5-template-fixes.patch
+Patch0: php-pear-1.4.8-template.patch
-Patch1: php-pear-1.4.5-template-postun.patch
+Patch1: php-pear-1.4.8-package.patch
-Patch2: php-pear-1.4.5-makerpm-cleanup.patch
-Patch3: php-pear-1.4.5-makerpm-rh-namingconvs.patch
 BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: php >= 5.1.0-1
@@ -52,10 +51,8 @@ export PHP_PEAR_CACHE_DIR=%{_localstatedir}/cache/php-pear
                  %{SOURCE20}
 
 pushd %{buildroot}%{peardir}
-%{__patch} -p0 data/PEAR/template.spec %{PATCH0}
+%{__patch} -p0 < %{PATCH0}
-%{__patch} -p1 data/PEAR/template.spec %{PATCH1}
+%{__patch} -p0 < %{PATCH1}
-%{__patch} -p0 < %{PATCH2}
-%{__patch} -p0 < %{PATCH3}
 popd
 
 # Replace /usr/bin/* with simple scripts:
@@ -64,7 +61,8 @@ for f in pecl pear peardev; do
 done
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir} \
-           $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear
+           $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
+           $RPM_BUILD_ROOT%{peardir}/.pkgxml
 
 # Relocate everything:
 sed -si "s,$RPM_BUILD_ROOT,,g" \
@@ -81,6 +79,8 @@ for f in $RPM_BUILD_ROOT%{peardir}/.registry/*.reg; do
    mv ${f}.new ${f}
 done
 
+install -m 644 -c $RPM_SOURCE_DIR/LICENSE .
+
 %check
 # 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
@@ -97,8 +97,15 @@ rm pear.conf
 %{_bindir}/*
 %config %{_sysconfdir}/pear.conf
 %dir %{_localstatedir}/cache/php-pear
+%doc LICENSE
 
 %changelog
+* Mon May  8 2006 Joe Orton <jorton@redhat.com> 1:1.4.9-2
+- update to 1.4.9 (thanks to Remi Collet, #183359)
+- package /usr/share/pear/.pkgxml (#190252)
+- update to XML_RPC-1.4.8
+- bundle the v3.0 LICENSE file
+
 * Tue Feb 28 2006 Joe Orton <jorton@redhat.com> 1:1.4.6-2
 - set cache_dir directory, own /var/cache/php-pear
 

sources

@@ -1,2 +1,2 @@
-48a9334065e24afdf7a623046eae9d78  XML_RPC-1.4.4.tgz
+c2e94575bd14a4425de9e20976c65d43  XML_RPC-1.4.8.tgz
-2d10cdab58239fd738cb1b1d5a5047df  install-pear-nozlib-1.4.6.phar
+1030f325e0ce140db7cb3063bda52d3b  install-pear-nozlib-1.4.9.phar