diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-10-06 18:22:00 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-10-06 18:22:00 +0200 |
commit | dc054e3e72c9ecda81c16a9a4d33359eab43dfa6 (patch) | |
tree | b5bda160607c7b66ff2a9bff2b9f0501029f786a | |
parent | bfaf4e607e0a8d7fac7f34bf784a69a70f2d3c92 (diff) |
php-symfony2-OptionsResolver minor fixes
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | bootstrap.php | 24 | ||||
-rw-r--r-- | php-symfony2-OptionsResolver.spec | 24 |
3 files changed, 51 insertions, 1 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/bootstrap.php b/bootstrap.php new file mode 100644 index 0000000..329fef2 --- /dev/null +++ b/bootstrap.php @@ -0,0 +1,24 @@ +<?php + +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier <fabien@symfony.com> + * + * 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.spec b/php-symfony2-OptionsResolver.spec index 5e12e4e..5c12bf0 100644 --- a/php-symfony2-OptionsResolver.spec +++ b/php-symfony2-OptionsResolver.spec @@ -1,3 +1,4 @@ +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_channel pear.symfony.com @@ -12,10 +13,13 @@ Group: Development/Libraries License: MIT URL: http://symfony.com/components Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +Source1: bootstrap.php BuildArch: noarch BuildRequires: php-pear(PEAR) BuildRequires: php-channel(%{pear_channel}) +# For tests +BuildRequires: php-pear(pear.phpunit.de/PHPUnit) Requires: php-common >= 5.3.2 Requires: php-pear(PEAR) @@ -38,6 +42,14 @@ 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"/' \ + -e '/Tests/s/role="php"/role="test"/' \ + -e '/.gitignore/d' \ + -i package.xml + # package.xml is version 2.0 mv package.xml %{pear_name}-%{version}/%{name}.xml @@ -51,13 +63,19 @@ cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Clean up unnecessary files -rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* +rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} +%check +cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}/Tests +cp %{SOURCE1} bootstrap.php +phpunit --bootstrap bootstrap.php --verbose . + + %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : @@ -76,8 +94,12 @@ fi %dir %{pear_phpdir}/Symfony %dir %{pear_phpdir}/Symfony/Component %{pear_phpdir}/Symfony/Component/%{pear_name} + %{pear_testdir}/%{pear_name} %changelog +* Sat Oct 6 2012 Remi Collet <RPMS@FamilleCollet.com> 2.1.2-1 +- rebuild + * Thu Sep 20 2012 Shawn Iwinski <shawn.iwinski@gmail.com> 2.1.2-1 - Initial package |