From 9287d8e3d20161dc6dc48adf63d87d74c1fa9ee5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 6 Apr 2013 16:26:14 +0200 Subject: php-symfony2-OptionsResolver: sync with rawhide --- php-symfony2-OptionsResolver.spec | 65 ++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/php-symfony2-OptionsResolver.spec b/php-symfony2-OptionsResolver.spec index 639d65e..3613d1b 100644 --- a/php-symfony2-OptionsResolver.spec +++ b/php-symfony2-OptionsResolver.spec @@ -1,10 +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 OptionsResolver %global php_min_ver 5.3.3 -Name: php-symfony2-OptionsResolver +Name: php-symfony2-%{pear_name} Version: 2.2.0 Release: 1%{?dist} Summary: Symfony2 %{pear_name} Component @@ -16,12 +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}) -# Test requires +# For tests BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-pear(pear.phpunit.de/PHPUnit) -# Test requires: phpci +# For tests: phpci Requires: php-reflection Requires: php-spl @@ -30,7 +31,7 @@ Requires: php-pear(PEAR) Requires: php-channel(%{pear_channel}) Requires(post): %{__pear} Requires(postun): %{__pear} -# phpci requires +# phpci Requires: php-reflection Requires: php-spl @@ -47,13 +48,44 @@ default value depends on the value of another option. %prep %setup -q -c +# Create PHPUnit autoloader +( cat <<'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 "test" for all test files -# - Remove md5sum from bootsrap.php file since it was patched -sed -e '/\.gitignore/d' \ - -e '/phpunit.xml.dist/s/role="php"/role="test"/' \ +# - Remove md5sum from phpunit.xml.dist file since it was updated +sed -e '/\.gitattributes/d' \ + -e '/\.gitignore/d' \ -e '/Tests/s/role="php"/role="test"/' \ + -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 @@ -75,16 +107,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 +# Install PHPUnit autoloader +install -pm 0644 ../phpunit.autoloader.php \ + %{buildroot}/%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/ %check 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 + +sed 's#./phpunit.autoloader.php#./autoloader.php#' -i phpunit.xml.dist + +%{_bindir}/phpunit -d date.timezone="UTC" %post @@ -110,6 +143,10 @@ fi %changelog +* Wed Mar 13 2013 Shawn Iwinski 2.2.0-1 +- Updated to 2.2.0 +- Removed tests' bootstrap patch + * Tue Mar 05 2013 Remi Collet - 2.2.0-1 - Update to 2.2.0 -- cgit