From 0ee18a2d98abd57bc36b4529b7889b6e379d6821 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jan 16 2010 09:06:57 +0000 Subject: update components + fix licenses --- diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 6c1c170..0000000 --- a/LICENSE +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - 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 - ". - -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 . - -This product includes the Zend Engine, freely available at -. diff --git a/php-pear.spec b/php-pear.spec index 7107cd7..602fee4 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -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/package/PEAR-%{version}.tgz 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 basic PEAR components. 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_ROOT%{_bindir}/peardev %{_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 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 1:1.9.0-1 - update to PEAR 1.9.0, XML_RPC 1.5.2 diff --git a/sources b/sources index f2c5418..133431c 100644 --- a/sources +++ b/sources @@ -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