From 11df578b4cdb020faa8fe48bdc77206d799b38e4 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 5 Mar 2013 17:16:52 +0100
Subject: php-symfony2-CssSelector: 2.2.0
---
php-symfony2-CssSelector-tests-bootstrap.patch | 24 ------------------------
php-symfony2-CssSelector.spec | 20 +++++++++++---------
2 files changed, 11 insertions(+), 33 deletions(-)
delete mode 100644 php-symfony2-CssSelector-tests-bootstrap.patch
diff --git a/php-symfony2-CssSelector-tests-bootstrap.patch b/php-symfony2-CssSelector-tests-bootstrap.patch
deleted file mode 100644
index 604772c..0000000
--- a/php-symfony2-CssSelector-tests-bootstrap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Symfony/Component/CssSelector/Tests/bootstrap.php 2012-09-20 03:42:08.000000000 -0400
-+++ Symfony/Component/CssSelector/Tests/bootstrap.php 2012-10-19 23:15:56.672195503 -0400
-@@ -10,9 +10,18 @@
- */
-
- spl_autoload_register(function ($class) {
-- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\CssSelector')) {
-- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\CssSelector')).'.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-CssSelector.spec b/php-symfony2-CssSelector.spec
index 657b326..b8279fc 100644
--- a/php-symfony2-CssSelector.spec
+++ b/php-symfony2-CssSelector.spec
@@ -5,7 +5,7 @@
%global php_min_ver 5.3.3
Name: php-symfony2-CssSelector
-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/css_selector.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
@@ -46,11 +45,6 @@ The CssSelector Component converts CSS selectors to XPath expressions.
%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
@@ -60,7 +54,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
@@ -82,10 +75,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
@@ -111,6 +110,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
--
cgit