php-phpunit-FinderFacade: upstream patch for Finder 2.2.0 compatibility

2 files changed, 75 insertions, 5 deletions

diff --git a/FinderFacade.patch b/FinderFacade.patch
new file mode 100644
index 0000000..fb9b8ec
--- /dev/null
+++ b/FinderFacade.patch
@@ -0,0 +1,64 @@
+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 b10367e..75dbe1a 100644
--- a/php-phpunit-FinderFacade.spec
+++ b/php-phpunit-FinderFacade.spec
@@ -5,15 +5,16 @@
 
 Name:           php-phpunit-FinderFacade
 Version:        1.0.6
-Release:        1%{?dist}
+Release:        2%{?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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{pear_name}.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.9.4
 BuildRequires:  php-channel(%{channel})
@@ -24,8 +25,7 @@ Requires:       php(language) >= 5.3.3
 Requires:       php-ctype
 Requires:       php-spl
 Requires:       php-pear(pear.netpirates.net/fDOMDocument) >= 1.3.1
-Requires:       php-pear(pear.symfony.com/Finder) >= 2.1.0
-Conflicts:      php-pear(pear.symfony.com/Finder) >= 2.1.99
+Requires:       php-pear(pear.symfony.com/Finder) >= 2.2.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -38,7 +38,10 @@ Convenience wrapper for Symfony's Finder component.
 
 %prep
 %setup -q -c
-mv package.xml %{pear_name}-%{version}/%{name}.xml
+
+%patch0 -p0
+sed -e 's/md5sum=.*name/name/' \
+    package.xml >%{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -85,6 +88,9 @@ fi
 
 
 %changelog
+* Wed Mar  6 2013 Remi Collet <remi@fedoraproject.org> - 1.0.6-2
+- upstream patch for Finder 2.2.0 compatibility
+
 * Thu Jan 10 2013 Remi Collet <remi@fedoraproject.org> - 1.0.6-1
 - Version 1.0.6 (stable) - API 1.0.1 (stable)