From 92c8dd5ace51d472134a1d33217681ae81351bab Mon Sep 17 00:00:00 2001 From: remi Date: Apr 01 2012 07:41:45 +0000 Subject: update to 1.4.0 (splited in File, File_CSV, File_Util) --- diff --git a/.gitignore b/.gitignore index fd962c4..9325398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -File-1.3.0.tgz -package.xml +*spec~ +package-*.xml +/File-1.4.0.tgz diff --git a/PHP-LICENSE-3.01 b/PHP-LICENSE-3.01 deleted file mode 100644 index 8d3fa07..0000000 --- a/PHP-LICENSE-3.01 +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - 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@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 software, 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 . - -PHP includes the Zend Engine, freely available at -. diff --git a/php-pear-File.spec b/php-pear-File.spec index 35d2caf..827d3ba 100644 --- a/php-pear-File.spec +++ b/php-pear-File.spec @@ -2,8 +2,8 @@ %global pear_name File Name: php-pear-File -Version: 1.3.0 -Release: 5%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Common file and directory routines Group: Development/Languages @@ -12,26 +12,25 @@ URL: http://pear.php.net/package/File Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch -BuildRequires: php-pear(PEAR) >= 1.5.3 -Requires: php-pear(PEAR) >= 1.5.3 +BuildRequires: php-pear(PEAR) >= 1.6.0 + +Requires: php-pear(PEAR) >= 1.6.0 +# Yes, this are circular dependencies, from upstream +Requires: php-pear(File_CSV) +Requires: php-pear(File_Util) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description Provides easy access to read/write to files along with some common routines -to deal with paths. Also provides interface for handling CSV files. +to deal with paths. %prep %setup -qc -# Create a "localized" php.ini to avoid build warning -cp /etc/php.ini . -echo "date.timezone=UTC" >>php.ini - cd %{pear_name}-%{version} # Package is V2 mv ../package.xml %{name}.xml @@ -43,29 +42,30 @@ cd %{pear_name}-%{version} %install +rm -rf %{buildroot} cd %{pear_name}-%{version} -rm -rf $RPM_BUILD_ROOT docdir -PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml +%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files -rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* +rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description -install -d $RPM_BUILD_ROOT%{pear_xmldir} -install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} +install -d %{buildroot}%{pear_xmldir} +install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %check -# For documentation purpose -# After install, run (as root) -# pear run-tests -p File -# Shoud return -# 36 PASSED TESTS -# 0 SKIPPED TESTS +cd %{pear_name}-%{version} +%{__pear} \ + run-tests \ + --recur \ + --ini "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \ + tests | tee ../tests.log +grep "FAILED TESTS" ../tests.log && exit 1 %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post @@ -87,6 +87,11 @@ fi %changelog +* Sun Apr 01 2012 Remi Collet - 1.4.0-1 +- update to 1.4.0 +- run test suite during %%check +- splited in File, File_CSV and File_Util + * Wed Feb 09 2011 Fedora Release Engineering - 1.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 9ef67e2..1bb1130 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d806e98095f2b10373ac521a098d9ed File-1.3.0.tgz +a14a44b2492deecc09dff0fef69c796a File-1.4.0.tgz