php-symfony2-DependencyInjection: 2.2.0

2 files changed, 15 insertions, 37 deletions

diff --git a/php-symfony2-DependencyInjection-tests-bootstrap.patch b/php-symfony2-DependencyInjection-tests-bootstrap.patch
deleted file mode 100644
index 03be72e..0000000
--- a/php-symfony2-DependencyInjection-tests-bootstrap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Symfony/Component/DependencyInjection/Tests/bootstrap.php	2012-09-20 03:42:08.000000000 -0400
-+++ Symfony/Component/DependencyInjection/Tests/bootstrap.php	2012-10-20 22:38:53.782073532 -0400
-@@ -10,9 +10,18 @@
-  */
- 
- spl_autoload_register(function ($class) {
--    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\DependencyInjection')) {
--        if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\DependencyInjection')).'.php')) {
--            require_once $file;
-+    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) {
-+        $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php';
-+        if (file_exists(__DIR__.'/../..'.$file)) {
-+            // Load from source tree
-+            require_once __DIR__.'/../..'.$file;
-+        } else {
-+            try {
-+                // Try loading from incude path
-+                require_once 'Symfony/Component'.$file;
-+            } catch (Exception $e) {
-+                // Fail silently so class not found fatal error still raised
-+            }
-         }
-     }
- });
diff --git a/php-symfony2-DependencyInjection.spec b/php-symfony2-DependencyInjection.spec
index 15f8391..3619b8c 100644
--- a/php-symfony2-DependencyInjection.spec
+++ b/php-symfony2-DependencyInjection.spec
@@ -5,7 +5,7 @@
 %global php_min_ver  5.3.3
 
 Name:             php-symfony2-DependencyInjection
-Version:          2.1.8
+Version:          2.2.0
 Release:          1%{?dist}
 Summary:          Symfony2 %{pear_name} Component
 
@@ -13,7 +13,6 @@ Group:            Development/Libraries
 License:          MIT
 URL:              http://symfony.com/doc/current/components/dependency_injection/index.html
 Source0:          http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-Patch0:           %{name}-tests-bootstrap.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
@@ -22,8 +21,8 @@ BuildRequires:    php-channel(%{pear_channel})
 # Test requires
 BuildRequires:    php(language) >= %{php_min_ver}
 BuildRequires:    php-pear(pear.phpunit.de/PHPUnit)
-BuildRequires:    php-pear(%{pear_channel}/Config) >= 2.1.0
-BuildRequires:    php-pear(%{pear_channel}/Yaml) >= 2.1.0
+BuildRequires:    php-pear(%{pear_channel}/Config) >= 2.2.0
+BuildRequires:    php-pear(%{pear_channel}/Yaml) >= 2.2.0
 # Test requires: phpci
 BuildRequires:    php-ctype
 BuildRequires:    php-dom
@@ -49,8 +48,8 @@ Requires:         php-reflection
 Requires:         php-simplexml
 Requires:         php-spl
 # Optional requires
-Requires:         php-pear(%{pear_channel}/Config) >= 2.1.0
-Requires:         php-pear(%{pear_channel}/Yaml) >= 2.1.0
+Requires:         php-pear(%{pear_channel}/Config) >= 2.2.0
+Requires:         php-pear(%{pear_channel}/Yaml) >= 2.2.0
 
 Provides:         php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -65,11 +64,6 @@ Service Container (http://symfony.com/doc/current/book/service_container.html).
 %prep
 %setup -q -c
 
-# Patches
-cd %{pear_name}-%{version}
-%patch0 -p0
-cd ..
-
 # Modify PEAR package.xml file:
 # - Remove .gitignore file
 # - Change role from "php" to "doc" for CHANGELOG.md file
@@ -79,7 +73,6 @@ sed -e '/\.gitignore/d' \
     -e '/CHANGELOG.md/s/role="php"/role="doc"/' \
     -e '/phpunit.xml.dist/s/role="php"/role="test"/' \
     -e '/Tests/s/role="php"/role="test"/' \
-    -e '/bootstrap.php/s/md5sum="[^"]*"\s*//' \
     -i package.xml
 
 # package.xml is version 2.0
@@ -101,10 +94,16 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
 mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
+sed -e '/bootstrap/s:vendor/autoload.php:%{pear_phpdir}/Symfony/Component/%{pear_name}/autoloader.php:' \
+      %{buildroot}%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/phpunit.xml.dist \
+    > %{buildroot}%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/phpunit.xml
+
 
 %check
 cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
-%{_bindir}/phpunit
+sed -e '/bootstrap/s:vendor/autoload.php:autoloader.php:' \
+    phpunit.xml.dist > phpunit.xml
+%{_bindir}/phpunit -d date.timezone=UTC
 
 
 %post
@@ -128,6 +127,9 @@ fi
 
 
 %changelog
+* Tue Mar 05 2013 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+
 * Wed Feb 27 2013 Remi Collet <remi@fedoraproject.org> - 2.1.8-1
 - Update to 2.1.8