summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-symfony2-HttpKernel-tests-bootstrap.patch24
-rw-r--r--php-symfony2-HttpKernel.spec58
2 files changed, 30 insertions, 52 deletions
diff --git a/php-symfony2-HttpKernel-tests-bootstrap.patch b/php-symfony2-HttpKernel-tests-bootstrap.patch
deleted file mode 100644
index 099c67f..0000000
--- a/php-symfony2-HttpKernel-tests-bootstrap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Symfony/Component/HttpKernel/Tests/bootstrap.php 2012-09-20 03:42:12.000000000 -0400
-+++ Symfony/Component/HttpKernel/Tests/bootstrap.php 2012-10-27 17:02:39.283668836 -0400
-@@ -10,9 +10,18 @@
- */
-
- spl_autoload_register(function ($class) {
-- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\HttpKernel')) {
-- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\HttpKernel')).'.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-HttpKernel.spec b/php-symfony2-HttpKernel.spec
index 544bb03..6f633fe 100644
--- a/php-symfony2-HttpKernel.spec
+++ b/php-symfony2-HttpKernel.spec
@@ -7,7 +7,7 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: php-symfony2-HttpKernel
-Version: 2.1.8
+Version: 2.2.0
Release: 1%{?dist}
Summary: Symfony2 %{pear_name} Component
@@ -15,7 +15,6 @@ Group: Development/Libraries
License: MIT
URL: http://symfony.com/components
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
@@ -25,16 +24,16 @@ 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}/BrowserKit) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/ClassLoader) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/Config) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/Console) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/DependencyInjection) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/EventDispatcher) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/Finder) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/HttpFoundation) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/Process) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/Routing) >= 2.1.0
+BuildRequires: php-pear(%{pear_channel}/BrowserKit) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/ClassLoader) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Config) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Console) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/DependencyInjection) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/EventDispatcher) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Finder) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/HttpFoundation) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Process) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Routing) >= 2.2.0
# Test requires: phpci
BuildRequires: php-date
BuildRequires: php-json
@@ -51,8 +50,8 @@ BuildRequires: php-tokenizer
Requires: php(language) >= %{php_min_ver}
Requires: php-pear(PEAR)
Requires: php-channel(%{pear_channel})
-Requires: php-pear(%{pear_channel}/EventDispatcher) >= 2.1.0
-Requires: php-pear(%{pear_channel}/HttpFoundation) >= 2.1.0
+Requires: php-pear(%{pear_channel}/EventDispatcher) >= 2.2.0
+Requires: php-pear(%{pear_channel}/HttpFoundation) >= 2.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
# phpci requires
@@ -67,12 +66,12 @@ Requires: php-session
Requires: php-spl
Requires: php-tokenizer
# Optional requires
-Requires: php-pear(%{pear_channel}/BrowserKit) >= 2.1.0
-Requires: php-pear(%{pear_channel}/ClassLoader) >= 2.1.0
-Requires: php-pear(%{pear_channel}/Config) >= 2.1.0
-Requires: php-pear(%{pear_channel}/Console) >= 2.1.0
-Requires: php-pear(%{pear_channel}/DependencyInjection) >= 2.1.0
-Requires: php-pear(%{pear_channel}/Finder) >= 2.1.0
+Requires: php-pear(%{pear_channel}/BrowserKit) >= 2.2.0
+Requires: php-pear(%{pear_channel}/ClassLoader) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Config) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Console) >= 2.2.0
+Requires: php-pear(%{pear_channel}/DependencyInjection) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Finder) >= 2.2.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -90,11 +89,6 @@ Optional dependencies: memcache, memcached, mongo
%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
@@ -104,7 +98,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
@@ -126,11 +119,17 @@ 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
%if %{with_tests}
- cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
- %{_bindir}/phpunit
+cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
+sed -e '/bootstrap/s:vendor/autoload.php:autoloader.php:' \
+ phpunit.xml.dist > phpunit.xml
+%{_bindir}/phpunit -d date.timezone=UTC
%else
: Tests skipped, missing '--with tests' option
%endif
@@ -157,6 +156,9 @@ fi
%changelog
+* Wed Mar 06 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