From 450662b4d1ce8e3bac3cd99a84d15caa0eec4087 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Oct 2012 18:12:33 +0100 Subject: php-symfony2-OptionsResolver: sync with rawhide, update to 2.1.3 --- bootstrap.php | 24 --------- php-symfony2-OptionsResolver-tests-bootstrap.patch | 24 +++++++++ php-symfony2-OptionsResolver.spec | 59 +++++++++++++++------- 3 files changed, 66 insertions(+), 41 deletions(-) delete mode 100644 bootstrap.php create mode 100644 php-symfony2-OptionsResolver-tests-bootstrap.patch diff --git a/bootstrap.php b/bootstrap.php deleted file mode 100644 index 329fef2..0000000 --- a/bootstrap.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -date_default_timezone_set('UTC'); -spl_autoload_register(function ($class) { - if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) { - $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php'; - if (file_exists(__DIR__.'/../..'.$file)) { - # Run from source tree - require_once __DIR__.'/../..'.$file; - } else { - # Run from install dir - require_once 'Symfony/Component'.$file; - } - } -}); diff --git a/php-symfony2-OptionsResolver-tests-bootstrap.patch b/php-symfony2-OptionsResolver-tests-bootstrap.patch new file mode 100644 index 0000000..e4f64b8 --- /dev/null +++ b/php-symfony2-OptionsResolver-tests-bootstrap.patch @@ -0,0 +1,24 @@ +--- Symfony/Component/OptionsResolver/Tests/bootstrap.php 2012-09-20 03:42:16.000000000 -0400 ++++ Symfony/Component/OptionsResolver/Tests/bootstrap.php 2012-10-08 17:43:39.793922871 -0400 +@@ -10,9 +10,18 @@ + */ + + spl_autoload_register(function ($class) { +- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\OptionsResolver')) { +- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\OptionsResolver')).'.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-OptionsResolver.spec b/php-symfony2-OptionsResolver.spec index 8eafd39..f0a7063 100644 --- a/php-symfony2-OptionsResolver.spec +++ b/php-symfony2-OptionsResolver.spec @@ -1,11 +1,12 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_channel pear.symfony.com %global pear_name %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g') +%global php_min_ver 5.3.3 Name: php-symfony2-OptionsResolver -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} Summary: Symfony2 %{pear_name} Component @@ -13,16 +14,20 @@ Group: Development/Libraries License: MIT URL: http://symfony.com/components Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Source1: bootstrap.php +Patch0: %{name}-tests-bootstrap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear(PEAR) BuildRequires: php-channel(%{pear_channel}) -# For tests +# Test requires +BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-pear(pear.phpunit.de/PHPUnit) +# Test requires: phpci +Requires: php-reflection +Requires: php-spl -Requires: php-common >= 5.3.2 +Requires: php(language) >= %{php_min_ver} Requires: php-pear(PEAR) Requires: php-channel(%{pear_channel}) Requires(post): %{__pear} @@ -44,11 +49,18 @@ default value depends on the value of another option. %prep %setup -q -c -# Hum... -sed -e '/CHANGELOG.md/s/role="php"/role="doc"/' \ - -e '/phpunit.xml.dist/s/role="php"/role="test"/' \ +# Patches +cd %{pear_name}-%{version} +%patch0 -p0 +cd .. + +# Modify PEAR package.xml file: +# - Change role from "php" to "test" for all test files +# - Remove md5sum from bootsrap.php file since it was patched +sed -e '/phpunit.xml.dist/s/role="php"/role="test"/' \ -e '/Tests/s/role="php"/role="test"/' \ - -e '/.gitignore/d' \ + -e '/bootstrap.php/s/md5sum="[^"]*"\s*//' \ + -e '/.gitattributes/d' \ -i package.xml # package.xml is version 2.0 @@ -61,20 +73,19 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml %install cd %{pear_name}-%{version} -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml +%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files -rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??* +rm -rf %{buildroot}%{pear_metadir}/.??* # Install XML package description -mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} -install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} +mkdir -p %{buildroot}%{pear_xmldir} +install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %check -cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}/Tests -cp %{SOURCE1} bootstrap.php -phpunit --bootstrap bootstrap.php --verbose . +cd %{pear_name}-%{version}/Symfony/Component/%{pear_name} +%{_bindir}/phpunit %post @@ -96,10 +107,24 @@ fi %dir %{pear_phpdir}/Symfony %dir %{pear_phpdir}/Symfony/Component %{pear_phpdir}/Symfony/Component/%{pear_name} - %{pear_testdir}/%{pear_name} +%{pear_testdir}/%{pear_name} %changelog +* Tue Oct 30 2012 Remi Collet 2.1.3-1 +- sync with rawhide, update to 2.1.3 + +* Mon Oct 29 2012 Shawn Iwinski 2.1.2-3 +- Added "%%global pear_metadir" and usage in %%install +- Changed RPM_BUILD_ROOT to %%{buildroot} +- Changed name of patch from "php-symfony2-OptionsResolver.tests.bootstrap.patch" + to "%{name}-tests-bootstrap.patch" + +* Mon Oct 8 2012 Shawn Iwinski 2.1.2-2 +- Added PEAR package.xml modifications +- Added patch for tests' bootstrap.php +- Added tests (%%check) + * Sat Oct 6 2012 Remi Collet 2.1.2-1 - rebuild -- cgit