diff options
| -rw-r--r-- | php-symfony2-Form.spec | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/php-symfony2-Form.spec b/php-symfony2-Form.spec index a16ba89..6426c6b 100644 --- a/php-symfony2-Form.spec +++ b/php-symfony2-Form.spec @@ -3,9 +3,10 @@ %global pear_channel pear.symfony.com %global pear_name Form %global php_min_ver 5.3.3 +%global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: php-symfony2-%{pear_name} -Version: 2.2.2 +Version: 2.2.5 Release: 1%{?dist} Summary: Symfony2 %{pear_name} Component @@ -18,6 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear(PEAR) BuildRequires: php-channel(%{pear_channel}) +%if %{with_tests} # For tests BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-pear(pear.phpunit.de/PHPUnit) @@ -43,6 +45,7 @@ BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-session BuildRequires: php-spl +%endif Requires: php(language) >= %{php_min_ver} Requires: php-pear(PEAR) @@ -112,15 +115,9 @@ 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 CHANGELOG.md file # - Change role from "php" to "test" for all test files # - Remove md5sum from phpunit.xml.dist file since it was updated -sed -e '/\.gitattributes/d' \ - -e '/\.gitignore/d' \ - -e '/CHANGELOG.md/s/role="php"/role="doc"/' \ - -e '/Tests/s/role="php"/role="test"/' \ +sed -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 @@ -154,11 +151,15 @@ cd %{pear_name}-%{version}/Symfony/Component/%{pear_name} cp ../../../../phpunit.autoloader.php . +%if %{with_tests} %{_bindir}/phpunit \ -d include_path="%{buildroot}%{pear_phpdir}:%{buildroot}%{pear_testdir}/%{pear_name}:.:%{pear_phpdir}:%{_datadir}/php" \ -d date.timezone="UTC" \ || : Temporarily ignore failed tests # TODO: Need to fix why these tests are failing for rpmbuild +%else +: Test disabled, missing '--with tests' option. +%endif %post @@ -182,6 +183,23 @@ fi %changelog +* Thu Aug 22 2013 Remi Collet <remi@fedoraproject.org> - 2.2.5-1 +- Updated to 2.2.5 +- disable tests as results are ignored... + +* Fri Aug 09 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 2.2.5-1 +- Updated to 2.2.5 + +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 02 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 2.2.3-1 +- Updated to 2.2.3 + +* Thu Jun 13 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 2.2.2-1 +- Updated to 2.2.2 +- Removed package.xml modifications fixed usptream + * Mon Jun 03 2013 Remi Collet <remi@fedoraproject.org> - 2.2.2-1 - Update to 2.2.2 |