From b76197769fd840a8c8bd5714739386dcb2eefbb7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Apr 03 2015 13:04:24 +0000 Subject: update to 1.4.0 --- diff --git a/.gitignore b/.gitignore index a4a9ef2..9d564e8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ File_Iterator-1.2.2.tgz /File_Iterator-1.3.3.tgz /File_Iterator-1.3.4.tgz /php-file-iterator-1.3.4.tar.gz +/php-file-iterator-1.4.0.tar.gz diff --git a/php-phpunit-File-Iterator.spec b/php-phpunit-File-Iterator.spec index 2995843..911a19a 100644 --- a/php-phpunit-File-Iterator.spec +++ b/php-phpunit-File-Iterator.spec @@ -1,4 +1,13 @@ -%global gh_commit acd690379117b042d1c8af1fafd61bde001bf6bb +# spec file for php-phpunit-File-Iterator +# +# Copyright (c) 2009-2015 Christof Damian, Remi Collet +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please, preserve the changelog entries +# +%global gh_commit a923bb15680d0089e2316f7a4af8f437046e96bb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-file-iterator @@ -9,8 +18,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: php-phpunit-File-Iterator -Version: 1.3.4 -Release: 5%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes Group: Development/Libraries @@ -20,6 +29,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch BuildRequires: php(language) >= 5.3.3 +BuildRequires: %{_bindir}/phpab # From composer.json # "php": ">=5.3.3" @@ -41,22 +51,23 @@ FilterIterator implementation that filters files based on a list of suffixes. %prep %setup -q -n %{gh_project}-%{gh_commit} -rm File/Iterator/Autoload.php.in +# Restore PSR-0 tree +# see https://github.com/sebastianbergmann/php-file-iterator/issues/26 +mkdir -p File/Iterator/ +mv src/* File/Iterator/ +mv File/Iterator/Iterator.php File/Iterator.php %build -# Empty build section, most likely nothing required. - -# If upstream drop Autoload.php, command to generate it -#phpab \ -# --output File/Iterator/Autoload.php \ -# --template File/Iterator/Autoload.php.in \ -# File +%{_bindir}/phpab \ + --output File/Iterator/Autoload.php \ + --basedir File/Iterator \ + File %install mkdir -p %{buildroot}%{php_home} -cp -pr File %{buildroot}%{php_home} +cp -pr File %{buildroot}%{php_home}/File %post @@ -67,11 +78,17 @@ fi %files -%doc ChangeLog.markdown README.markdown LICENSE composer.json -%{php_home}/* +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc ChangeLog.md README.md composer.json +%{php_home}/File %changelog +* Thu Apr 2 2015 Remi Collet - 1.4.0-1 +- Update to 1.4.0 +- fix license handling + * Wed Jun 25 2014 Remi Collet - 1.3.4-5 - composer dependencies diff --git a/sources b/sources index 3fdb49f..9597ed4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2dadee84c6db877dfc4f755cf440aa1f php-file-iterator-1.3.4.tar.gz +70bbd7250e8158f5688b09ec6abcf309 php-file-iterator-1.4.0.tar.gz