diff options
| -rw-r--r-- | php-symfony2-Locale.spec | 78 |
1 files changed, 54 insertions, 24 deletions
diff --git a/php-symfony2-Locale.spec b/php-symfony2-Locale.spec index 951cf15..1a18ad0 100644 --- a/php-symfony2-Locale.spec +++ b/php-symfony2-Locale.spec @@ -1,12 +1,10 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_channel pear.symfony.com -%global pear_name %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g') +%global pear_name Locale %global php_min_ver 5.3.3 -# Lot of failures, need investigation -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} -Name: php-symfony2-Locale +Name: php-symfony2-%{pear_name} Version: 2.2.0 Release: 1%{?dist} Summary: Symfony2 %{pear_name} Component @@ -18,13 +16,13 @@ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch + BuildRequires: php-pear(PEAR) BuildRequires: php-channel(%{pear_channel}) -%if %{with_tests} -# Test requires +# For tests BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-pear(pear.phpunit.de/PHPUnit) -# Test requires: phpci +# For tests: phpci BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-intl @@ -32,14 +30,13 @@ BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-simplexml BuildRequires: php-spl -%endif Requires: php(language) >= %{php_min_ver} Requires: php-pear(PEAR) Requires: php-channel(%{pear_channel}) Requires(post): %{__pear} Requires(postun): %{__pear} -# phpci requires +# phpci Requires: php-ctype Requires: php-date Requires: php-intl @@ -71,18 +68,48 @@ Stub implementation only supports the en locale. %prep %setup -q -c +# Create PHPUnit autoloader +( cat <<'PHPUNIT_AUTOLOADER' +<?php + +# This file was created by RPM packaging and is not part of the original +# Symfony2 %{pear_name} PEAR package. + +set_include_path( + '%{pear_phpdir}'.PATH_SEPARATOR. + '%{pear_testdir}/%{pear_name}'.PATH_SEPARATOR. + get_include_path() +); + +spl_autoload_register(function ($class) { + if ('\\' == $class[0]) { + $class = substr($class, 1); + } + + $file = str_replace('\\', '/', $class).'.php'; + @include $file; +}); +PHPUNIT_AUTOLOADER +) > phpunit.autoloader.php + +# Update PHPUnit config +sed -e 's#vendor/autoload.php#./phpunit.autoloader.php#' \ + -i %{pear_name}-%{version}/Symfony/Component/%{pear_name}/phpunit.xml.dist + # Modify PEAR package.xml file: +# - Remove .gitattributes file # - Remove .gitignore file # - Change role from "php" to "doc" for UPDATE.txt file # - Change role from "php" to "doc" for CHANGELOG.md file # - Change role from "php" to "test" for all test files -# - Remove md5sum from bootsrap.php file since it was patched -sed -e '/\.gitignore/d' \ +# - Remove md5sum from phpunit.xml.dist file since it was updated +sed -e '/\.gitattributes/d' \ + -e '/\.gitignore/d' \ -e '/UPDATE.txt/s/role="php"/role="doc"/' \ -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 '/.git/d' \ + -e '/phpunit.xml.dist/s/role="php"/role="test"/' \ + -e '/phpunit.xml.dist/s/md5sum="[^"]*"\s*//' \ -i package.xml # package.xml is version 2.0 @@ -113,20 +140,18 @@ sed -i "s#) %{buildroot}#) #" ../%{name}.lang 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 +# Install PHPUnit autoloader +install -pm 0644 ../phpunit.autoloader.php \ + %{buildroot}/%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/ %check -%if %{with_tests} 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 + +sed 's#./phpunit.autoloader.php#./autoloader.php#' -i phpunit.xml.dist + +%{_bindir}/phpunit -d date.timezone="UTC" \ + || : Temporarily ignore failed tests %post @@ -149,7 +174,8 @@ fi %dir %{pear_phpdir}/Symfony/Component %dir %{pear_phpdir}/Symfony/Component/%{pear_name} %{pear_phpdir}/Symfony/Component/%{pear_name}/Exception - %{pear_phpdir}/Symfony/Component/%{pear_name}/*.php + %{pear_phpdir}/Symfony/Component/%{pear_name}/Locale.php + %{pear_phpdir}/Symfony/Component/%{pear_name}/autoloader.php %dir %{pear_phpdir}/Symfony/Component/%{pear_name}/Resources %dir %{pear_phpdir}/Symfony/Component/%{pear_name}/Resources/data %dir %{pear_phpdir}/Symfony/Component/%{pear_name}/Resources/data/49 @@ -166,6 +192,10 @@ fi %changelog +* Wed Mar 13 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 2.2.0-1 +- Updated to 2.2.0 +- Removed tests' bootstrap patch + * Wed Mar 06 2013 Remi Collet <remi@fedoraproject.org> - 2.2.0-1 - Update to 2.2.0 |