summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-10-19 08:03:07 +0200
committerRemi Collet <fedora@famillecollet.com>2013-10-19 08:03:07 +0200
commitcdf4f2368f9543cbd8618f75a7f4dafbec585d97 (patch)
treef1b8c9cef0e8d204eb6fc8cf5d8dc14c3461b943
parent4bd0bcba831b3ed491a647fdf66c7b20e32cee3b (diff)
symfony2: cleanups (dep from composer)HEADmaster
-rw-r--r--php-symfony2-Translation.spec13
1 files changed, 8 insertions, 5 deletions
diff --git a/php-symfony2-Translation.spec b/php-symfony2-Translation.spec
index 02c45d1..a5bde29 100644
--- a/php-symfony2-Translation.spec
+++ b/php-symfony2-Translation.spec
@@ -3,7 +3,7 @@
%global pear_channel pear.symfony.com
%global pear_name Translation
%global php_min_ver 5.3.3
-%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests 1
Name: php-symfony2-%{pear_name}
Version: 2.3.6
@@ -24,8 +24,8 @@ BuildRequires: php-channel(%{pear_channel})
# For tests
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
-BuildRequires: php-pear(%{pear_channel}/Config) >= 2.2.0
-BuildRequires: php-pear(%{pear_channel}/Yaml) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Config) > 2.2
+BuildRequires: php-pear(%{pear_channel}/Yaml) > 2.0
# For tests: phpci
BuildRequires: php-dom
BuildRequires: php-intl
@@ -50,8 +50,8 @@ Requires: php-pcre
Requires: php-simplexml
Requires: php-spl
# Optional
-Requires: php-pear(%{pear_channel}/Config) >= 2.2.0
-Requires: php-pear(%{pear_channel}/Yaml) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Config) > 2.2
+Requires: php-pear(%{pear_channel}/Yaml) > 2.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -128,6 +128,9 @@ cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
cp ../../../../phpunit.autoloader.php .
%if %{with_tests}
+# use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+rm -rf Tests/Catalogue
+
%{_bindir}/phpunit \
-d include_path="%{buildroot}%{pear_phpdir}:%{buildroot}%{pear_testdir}/%{pear_name}:.:%{pear_phpdir}:%{_datadir}/php" \
-d date.timezone="UTC" \