php-phpunit-bytekit: pull symfony 2.2 patch from rawhide

2 files changed, 57 insertions, 4 deletions

diff --git a/php-phpunit-bytekit.spec b/php-phpunit-bytekit.spec
index 3a8fb75..4f43b55 100644
--- a/php-phpunit-bytekit.spec
+++ b/php-phpunit-bytekit.spec
@@ -4,20 +4,23 @@
 
 Name:           php-phpunit-bytekit
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A command-line tool built on the PHP Bytekit extension
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://github.com/sebastianbergmann/bytekit-cli
 Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
+Patch0:         symfony_2.2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.9.4
+BuildRequires:  php(language) >= 5.3.3
+BuildRequires:  php-pear(PEAR) >= 1.9.4
 BuildRequires:  php-channel(%{channel})
 
-Requires:       php-common >= 5.3.3
+Requires:       php(language) >= 5.3.3
+Requires:       php-pear(PEAR) >= 1.9.4
 Requires:       php-channel(%{channel})
 Requires:       php-pear(pear.symfony.com/Finder) >= 2.1.0
 Requires:       php-pear(components.ez.no/ConsoleTools) >= 1.6
@@ -37,6 +40,7 @@ analysis tasks.
 
 %prep
 %setup -q -c
+%patch0 -p1 -b .orig
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
@@ -53,7 +57,7 @@ rm -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
@@ -84,6 +88,14 @@ fi
 
 
 %changelog
+* Tue Apr  9 2013 Remi Collet <RPMS@FamilleCollet.com> - 1.1.3-2
+- pull symfony 2.2 patch from rawhide
+
+* Mon Apr 01 2013 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.3-1
+- Fix metadata location, FTBFS #914373
+- upstream 1.1.3
+- Symfony 2.2 patch
+
 * Mon Aug 27 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.1.3-1
 - update to 1.1.3
 - add requires php-pear(pear.symfony.com/Finder) >= 2.1.0RC1
diff --git a/symfony_2.2.patch b/symfony_2.2.patch
new file mode 100644
index 0000000..818e5db
--- /dev/null
+++ b/symfony_2.2.patch
@@ -0,0 +1,41 @@
+diff -up bytekit-1.1.3/bytekit-1.1.3/Bytekit/Autoload.php.orig bytekit-1.1.3/bytekit-1.1.3/Bytekit/Autoload.php
+--- bytekit-1.1.3/bytekit-1.1.3/Bytekit/Autoload.php.orig	2012-08-27 07:04:15.000000000 +0200
++++ bytekit-1.1.3/bytekit-1.1.3/Bytekit/Autoload.php	2013-04-09 07:32:47.944781836 +0200
+@@ -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 'ezc/Base/base.php';
+ 
+ spl_autoload_register(
+diff -up bytekit-1.1.3/package.xml.orig bytekit-1.1.3/package.xml
+--- bytekit-1.1.3/package.xml.orig	2012-08-27 07:04:15.000000000 +0200
++++ bytekit-1.1.3/package.xml	2013-04-09 08:11:48.982117569 +0200
+@@ -56,7 +56,7 @@ http://github.com/sebastianbergmann/byte
+    <file baseinstalldir="/" md5sum="4482032bc64a2715b7ef8dbbdf9be56a" name="Bytekit/TextUI/Command.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+-   <file baseinstalldir="/" md5sum="0248192f65a86746e785c95a30f7887d" name="Bytekit/Autoload.php" role="php">
++   <file baseinstalldir="/" md5sum="92313ea99166d30f5b5545c5d30f427f" name="Bytekit/Autoload.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file baseinstalldir="/" md5sum="9681ac8f4ff75b8abd6b523a27bb3156" name="Bytekit/Disassembler.php" role="php">
+@@ -91,7 +91,7 @@ http://github.com/sebastianbergmann/byte
+    <package>
+     <name>Finder</name>
+     <channel>pear.symfony.com</channel>
+-    <min>2.1.0RC1</min>
++    <min>2.2.0</min>
+    </package>
+    <package>
+     <name>ConsoleTools</name>