diff options
| -rw-r--r-- | FinderFacade.patch | 64 | ||||
| -rw-r--r-- | php-phpunit-FinderFacade.spec | 16 |
2 files changed, 8 insertions, 72 deletions
diff --git a/FinderFacade.patch b/FinderFacade.patch deleted file mode 100644 index fb9b8ec..0000000 --- a/FinderFacade.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 3b8387d64a6653414b9afbf0e23f421ae010c6bf Mon Sep 17 00:00:00 2001 -From: Sebastian Bergmann <sb@sebastian-bergmann.de> -Date: Fri, 1 Mar 2013 06:49:09 -0500 -Subject: [PATCH] Depend on Symfony Yaml 2.2 - ---- - README.markdown | 2 +- - build/package.xml | 3 +-- - composer.json | 2 +- - src/autoload.php | 10 +--------- - src/autoload.php.in | 10 +--------- - 5 files changed, 5 insertions(+), 22 deletions(-) - -diff --git a/README.markdown b/README.markdown -index d76dde5..e6b4b6e 100644 ---- FinderFacade-1.0.6/README.markdown -+++ FinderFacade-1.0.6/README.markdown -@@ -1,7 +1,7 @@ - FinderFacade - ============ - --**FinderFacade** is a convenience wrapper for Symfony's [Finder](http://symfony.com/doc/2.0/components/finder.html) component. -+**FinderFacade** is a convenience wrapper for Symfony's [Finder](http://symfony.com/doc/2.2/components/finder.html) component. - - Installation - ------------ -diff --git a/build/package.xml b/build/package.xml -index 1ffad9e..5330fbe 100644 ---- package.xml -+++ package.xml -@@ -62,8 +62,7 @@ - <package> - <name>Finder</name> - <channel>pear.symfony.com</channel> -- <min>2.1.0</min> -- <max>2.1.99</max> -+ <min>2.2.0</min> - </package> - </required> - </dependencies> -diff --git a/src/autoload.php b/src/autoload.php -index 05246b1..d61293e 100644 ---- FinderFacade-1.0.6/SebastianBergmann/FinderFacade/autoload.php -+++ FinderFacade-1.0.6/SebastianBergmann/FinderFacade/autoload.php -@@ -41,15 +41,7 @@ - * @since File available since Release 1.0.0 - */ - --require_once 'Symfony/Component/Finder/Finder.php'; --require_once 'Symfony/Component/Finder/Glob.php'; --require_once 'Symfony/Component/Finder/Iterator/FilterIterator.php'; --require_once 'Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php'; --require_once 'Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php'; --require_once 'Symfony/Component/Finder/Iterator/FilenameFilterIterator.php'; --require_once 'Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php'; --require_once 'Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php'; --require_once 'Symfony/Component/Finder/SplFileInfo.php'; -+require_once 'Symfony/Component/Finder/autoloader.php'; - require_once 'TheSeer/fDOMDocument/autoload.php'; - - // @codingStandardsIgnoreFile --- -1.7.10 - diff --git a/php-phpunit-FinderFacade.spec b/php-phpunit-FinderFacade.spec index 75dbe1a..4b48930 100644 --- a/php-phpunit-FinderFacade.spec +++ b/php-phpunit-FinderFacade.spec @@ -1,25 +1,24 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name FinderFacade %global channel pear.phpunit.de Name: php-phpunit-FinderFacade -Version: 1.0.6 -Release: 2%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: Wrapper for Symfony Finder component Group: Development/Libraries License: BSD URL: https://github.com/sebastianbergmann/finder-facade Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz -Patch0: %{pear_name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: php(language) >= 5.3.3 BuildRequires: php-pear(PEAR) >= 1.9.4 BuildRequires: php-channel(%{channel}) -Requires: php-pear(PEAR) >= 1.9.2 +Requires: php-pear(PEAR) >= 1.9.4 Requires: php-channel(%{channel}) Requires: php(language) >= 5.3.3 Requires: php-ctype @@ -39,9 +38,7 @@ Convenience wrapper for Symfony's Finder component. %prep %setup -q -c -%patch0 -p0 -sed -e 's/md5sum=.*name/name/' \ - package.xml >%{pear_name}-%{version}/%{name}.xml +mv package.xml %{pear_name}-%{version}/%{name}.xml %build @@ -88,6 +85,9 @@ fi %changelog +* Mon May 27 2013 Remi Collet <remi@fedoraproject.org> - 1.0.7-1 +- Update to 1.0.7 (no change) + * Wed Mar 6 2013 Remi Collet <remi@fedoraproject.org> - 1.0.6-2 - upstream patch for Finder 2.2.0 compatibility |