rpms/php-pear/F-12 php-pear.spec, 1.38, 1.39 sources, 1.18, 1.19 LICENSE, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Sat Jan 16 09:06:57 UTC 2010
- Previous message: rpms/hercstudio/F-12 .cvsignore, 1.3, 1.4 hercstudio.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/hercstudio/F-11 .cvsignore, 1.3, 1.4 hercstudio.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/pkgs/rpms/php-pear/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20395
Modified Files:
php-pear.spec sources
Removed Files:
LICENSE
Log Message:
update components + fix licenses
Index: php-pear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear/F-12/php-pear.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- php-pear.spec 5 Sep 2009 05:35:05 -0000 1.38
+++ php-pear.spec 16 Jan 2010 09:06:57 -0000 1.39
@@ -1,18 +1,21 @@
%global peardir %{_datadir}/pear
-%global xmlrpcver 1.5.2
+%global xmlrpcver 1.5.3
%global getoptver 1.2.3
-%global arctarver 1.3.3
-%global structver 1.0.2
+%global arctarver 1.3.5
+%global structver 1.0.3
%global xmlutil 1.2.1
Summary: PHP Extension and Application Repository framework
Name: php-pear
Version: 1.9.0
-Release: 1%{?dist}
+Release: 3%{?dist}
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
URL: http://pear.php.net/package/PEAR
Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
@@ -20,7 +23,6 @@ Source0: http://download.pear.php.net/pa
Source1: install-pear.php
Source2: relocate.php
Source3: strip.php
-Source4: LICENSE
Source10: pear.sh
Source11: pecl.sh
Source12: peardev.sh
@@ -55,6 +57,9 @@ components. This package contains the b
for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
do
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
tar xzf %{SOURCE24} package.xml
mv package.xml XML_Util.xml
@@ -109,8 +114,6 @@ install -m 755 %{SOURCE12} $RPM_BUILD_RO
%{_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} \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear
@@ -155,10 +158,16 @@ rm new-pear.conf
%dir %{_localstatedir}/cache/php-pear
%dir %{_localstatedir}/www/html
%dir %{_sysconfdir}/pear
-%doc LICENSE README
+%doc README* LICENSE*
%changelog
+* Sat Jan 16 2010 Remi Collet <Fedora at FamilleCollet.com> 1:1.9.0-3
+- update to XML_RPC-1.5.3
+- fix licenses (multiple)
+- provide bundled LICENSE files
+- update to Archive_Tar-1.3.5, Structures_Graph-1.0.3
+
* Sat Sep 05 2009 Remi Collet <Fedora at FamilleCollet.com> 1:1.9.0-1
- update to PEAR 1.9.0, XML_RPC 1.5.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 5 Sep 2009 05:35:05 -0000 1.18
+++ sources 16 Jan 2010 09:06:57 -0000 1.19
@@ -1,6 +1,6 @@
-38d443cba3f2dc378fdadb73075dcad9 Archive_Tar-1.3.3.tgz
+c9e1d48cd1637ccd9da0c3976b875bc4 Archive_Tar-1.3.5.tgz
d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz
2f0056187b5f527c0f418f83014fc2a7 PEAR-1.9.0.tgz
-2664e2d024048f982e12fad4d1bfbb87 Structures_Graph-1.0.2.tgz
-8a4dd27585d30b39717f3f58bb1f94f5 XML_RPC-1.5.2.tgz
+d2d8db74818be5cb0af7def3fc285bfc Structures_Graph-1.0.3.tgz
+d7b0272564f05491f8d2c2de1707ee80 XML_RPC-1.5.3.tgz
b8d4efcdb11b308b179f7bb63043284f XML_Util-1.2.1.tgz
--- LICENSE DELETED ---
- Previous message: rpms/hercstudio/F-12 .cvsignore, 1.3, 1.4 hercstudio.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/hercstudio/F-11 .cvsignore, 1.3, 1.4 hercstudio.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list