[php-phpunit-bytekit] Fix FTBFS #914373 and UpStream 1.1.3 with Symfony 2.2 support
Guillaume Kulakowski
llaumgui at fedoraproject.org
Tue Apr 9 06:19:28 UTC 2013
commit c4191e86737bf9464891dfc1bdf20847781f7445
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date: Tue Apr 9 08:19:22 2013 +0200
Fix FTBFS #914373 and UpStream 1.1.3 with Symfony 2.2 support
.gitignore | 1 +
php-phpunit-bytekit.spec | 25 +++++++++++++++++--------
sources | 2 +-
symfony_2.2.patch | 41 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 60 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 671e975..d6e3117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
bytekit-1.1.1.tgz
/bytekit-1.1.2.tgz
+/bytekit-1.1.3.tgz
diff --git a/php-phpunit-bytekit.spec b/php-phpunit-bytekit.spec
index d4c6ad6..22491c5 100644
--- a/php-phpunit-bytekit.spec
+++ b/php-phpunit-bytekit.spec
@@ -3,21 +3,24 @@
%global channel pear.phpunit.de
Name: php-phpunit-bytekit
-Version: 1.1.2
-Release: 6%{?dist}
+Version: 1.1.3
+Release: 1%{?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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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-channel(%{channel})
+
Requires: php-channel(%{channel})
-Requires: php-pear(pear.phpunit.de/File_Iterator) >= 1.3.0
+Requires: php-pear(pear.symfony.com/Finder) >= 2.1.0
+Requires: php-pear(components.ez.no/ConsoleTools) >= 1.6
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -34,6 +37,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}
@@ -47,10 +51,10 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
-pear install --nodeps --packagingroot %{buildroot} %{name}.xml
+%{__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}
@@ -62,13 +66,13 @@ rm -rf %{buildroot}
%post
-pear install --nodeps --soft --force --register-only \
+%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- pear uninstall --nodeps --ignore-errors --register-only \
+ %{__pear} uninstall --nodeps --ignore-errors --register-only \
pear.phpunit.de/%{pear_name} >/dev/null || :
fi
@@ -81,6 +85,11 @@ fi
%changelog
+* 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
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 14a2f73..f954a88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4c7eb459a2961a71c2062c330d6f79b bytekit-1.1.2.tgz
+02c5a1a5cfe14ddb166ad8ed56bebcd5 bytekit-1.1.3.tgz
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>
More information about the scm-commits
mailing list