rpms/php-pear-PHP-CompatInfo/F-7 PHP-LICENSE-3.01, 1.2, 1.3 php-pear-PHP-CompatInfo.spec, 1.6, 1.7 sources, 1.6, 1.7
Remi Collet (remi)
fedora-extras-commits at redhat.com
Tue Nov 20 19:01:09 UTC 2007
Author: remi
Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16968
Modified Files:
php-pear-PHP-CompatInfo.spec sources
Added Files:
PHP-LICENSE-3.01
Log Message:
revert to 1.4.3
Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01 20 Nov 2007 19:00:36 -0000 1.3
@@ -0,0 +1,68 @@
+--------------------------------------------------------------------
+ The PHP License, version 3.01
+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 at 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 at 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 software, freely available from
+ <http://www.php.net/software/>".
+
+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 at php.net.
+
+For more information on the PHP Group and the PHP project,
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.
Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/F-7/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-PHP-CompatInfo.spec 20 Nov 2007 17:56:08 -0000 1.6
+++ php-pear-PHP-CompatInfo.spec 20 Nov 2007 19:00:36 -0000 1.7
@@ -2,15 +2,16 @@
%define pear_name PHP_CompatInfo
Name: php-pear-PHP-CompatInfo
-Version: 1.5.1
+Version: 1.4.3
Release: 1%{?dist}
Summary: Find out version and extensions required for a piece of code to run
Summary(fr): Trouver version et extensions nécessaires à l'exécution d'un code
Group: Development/Libraries
-License: PHP
+License: PHP License
URL: http://pear.php.net/package/PHP_CompatInfo
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source1: PHP-LICENSE-3.01
Source2: xml2changelog
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,12 +40,12 @@
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+%{__install} -m 644 -c %{SOURCE1} LICENSE
%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.
-
%install
rm -rf $RPM_BUILD_ROOT docdir
pushd %{pear_name}-%{version}
@@ -57,46 +58,41 @@
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-# rename pci.php to pcicmd to keep consistency with previous release
-mv $RPM_BUILD_ROOT%{_bindir}/pci.php $RPM_BUILD_ROOT%{_bindir}/pcicmd
+# Create "pcicmd" executable
+dos2unix -n $RPM_BUILD_ROOT%{pear_phpdir}/PHP/CompatInfo/pcicmd.php pcicmd
+%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
+( echo "#!%{_bindir}/php"
+ cat pcicmd
+) > $RPM_BUILD_ROOT%{_bindir}/pcicmd
+%{__chmod} +x $RPM_BUILD_ROOT%{_bindir}/pcicmd
popd
# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} docdir
# avoid rpmlint warning "wrong-file-end-of-line-encoding"
-#dos2unix -o docdir/docs/examples/* docdir/tests/*
-ls -al docdir/docs
-
+dos2unix -o docdir/docs/examples/* docdir/tests/*
%clean
rm -rf $RPM_BUILD_ROOT
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{pear_name}.xml >/dev/null || :
-
%postun
if [ $1 -eq 0 ] ; then
%{__pear} uninstall --nodeps --ignore-errors --register-only \
%{pear_name} >/dev/null || :
fi
-
%files
%defattr(-,root,root,-)
-%doc CHANGELOG docdir/tests docdir/docs/*
+%doc CHANGELOG LICENSE docdir/tests docdir/docs/examples
%{pear_phpdir}/PHP
%{pear_xmldir}/%{pear_name}.xml
%{_bindir}/pcicmd
-
%changelog
-* Tue Nov 20 2007 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
-- upgrade to 1.5.1
-- fix licence + del file
-
* Sat Apr 07 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.3-1
- upgrade to 1.4.3
@@ -113,4 +109,3 @@
- add french summary and description
- add pcicmd in /usr/bin
- convert docs to avoid rpmlint warning "wrong-file-end-of-line-encoding"
-
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 20 Nov 2007 17:56:08 -0000 1.6
+++ sources 20 Nov 2007 19:00:36 -0000 1.7
@@ -1 +1 @@
-0180665d11d4c3dae706b6cbd3f21ba7 PHP_CompatInfo-1.5.1.tgz
+cc05a26a79e3b2cdd0efb7a7239f5454 PHP_CompatInfo-1.4.3.tgz
More information about the fedora-extras-commits
mailing list