update to XML_RPC-1.5.3 and fix licenses

This commit is contained in:
Remi Collet 2010-01-16 08:58:09 +00:00
parent 17e6e443f1
commit f2efa72dc8
3 changed files with 17 additions and 9 deletions

View File

@ -2,5 +2,5 @@ Archive_Tar-1.3.5.tgz
Console_Getopt-1.2.3.tgz Console_Getopt-1.2.3.tgz
PEAR-1.9.0.tgz PEAR-1.9.0.tgz
Structures_Graph-1.0.3.tgz Structures_Graph-1.0.3.tgz
XML_RPC-1.5.2.tgz XML_RPC-1.5.3.tgz
XML_Util-1.2.1.tgz XML_Util-1.2.1.tgz

View File

@ -1,7 +1,7 @@
%global peardir %{_datadir}/pear %global peardir %{_datadir}/pear
%global xmlrpcver 1.5.2 %global xmlrpcver 1.5.3
%global getoptver 1.2.3 %global getoptver 1.2.3
%global arctarver 1.3.5 %global arctarver 1.3.5
%global structver 1.0.3 %global structver 1.0.3
@ -10,9 +10,12 @@
Summary: PHP Extension and Application Repository framework Summary: PHP Extension and Application Repository framework
Name: php-pear Name: php-pear
Version: 1.9.0 Version: 1.9.0
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 1 Epoch: 1
License: PHP # PEAR, Archive_Tar, XML_Util are BSD
# XML-RPC, Console_Getopt are PHP
# Structures_Graph is LGPL
License: BSD and PHP and LGPLv2+
Group: Development/Languages Group: Development/Languages
URL: http://pear.php.net/package/PEAR URL: http://pear.php.net/package/PEAR
Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
@ -20,7 +23,6 @@ Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
Source1: install-pear.php Source1: install-pear.php
Source2: relocate.php Source2: relocate.php
Source3: strip.php Source3: strip.php
Source4: LICENSE
Source10: pear.sh Source10: pear.sh
Source11: pecl.sh Source11: pecl.sh
Source12: peardev.sh Source12: peardev.sh
@ -55,6 +57,9 @@ components. This package contains the basic PEAR components.
for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
do do
tar xzf $archive --strip-components 1 || tar xzf $archive --strip-path 1 tar xzf $archive --strip-components 1 || tar xzf $archive --strip-path 1
file=${archive##*/}
[ -f LICENSE ] && mv LICENSE LICENSE-${file%%-*}
[ -f README ] && mv README README-${file%%-*}
done done
tar xzf %{SOURCE24} package.xml tar xzf %{SOURCE24} package.xml
mv package.xml XML_Util.xml mv package.xml XML_Util.xml
@ -109,8 +114,6 @@ install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_bindir}/peardev
%{_bindir}/php -r "print_r(unserialize(substr(file_get_contents('$RPM_BUILD_ROOT%{_sysconfdir}/pear.conf'),17)));" %{_bindir}/php -r "print_r(unserialize(substr(file_get_contents('$RPM_BUILD_ROOT%{_sysconfdir}/pear.conf'),17)));"
install -m 644 -c %{SOURCE4} LICENSE
install -m 644 -c %{SOURCE13} \ install -m 644 -c %{SOURCE13} \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear
@ -155,10 +158,15 @@ rm new-pear.conf
%dir %{_localstatedir}/cache/php-pear %dir %{_localstatedir}/cache/php-pear
%dir %{_localstatedir}/www/html %dir %{_localstatedir}/www/html
%dir %{_sysconfdir}/pear %dir %{_sysconfdir}/pear
%doc LICENSE README %doc README* LICENSE*
%changelog %changelog
* Fri Jan 01 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-3
- update to XML_RPC-1.5.3
- fix licenses (multiple)
- provide bundled LICENSE files
* Fri Jan 01 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-2 * Fri Jan 01 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-2
- update to Archive_Tar-1.3.5, Structures_Graph-1.0.3 - update to Archive_Tar-1.3.5, Structures_Graph-1.0.3

View File

@ -2,5 +2,5 @@ c9e1d48cd1637ccd9da0c3976b875bc4 Archive_Tar-1.3.5.tgz
d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz
2f0056187b5f527c0f418f83014fc2a7 PEAR-1.9.0.tgz 2f0056187b5f527c0f418f83014fc2a7 PEAR-1.9.0.tgz
d2d8db74818be5cb0af7def3fc285bfc Structures_Graph-1.0.3.tgz d2d8db74818be5cb0af7def3fc285bfc Structures_Graph-1.0.3.tgz
8a4dd27585d30b39717f3f58bb1f94f5 XML_RPC-1.5.2.tgz d7b0272564f05491f8d2c2de1707ee80 XML_RPC-1.5.3.tgz
b8d4efcdb11b308b179f7bb63043284f XML_Util-1.2.1.tgz b8d4efcdb11b308b179f7bb63043284f XML_Util-1.2.1.tgz