[php-symfony-icu] Tests always run; Require php-symfony-intl

[Shawn Iwinski]

commit 23796b0365aad4abc5debb98030402b20d6b8e22
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Wed Nov 27 10:23:38 2013 -0500

    Tests always run; Require php-symfony-intl

 php-symfony-icu.spec |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/php-symfony-icu.spec b/php-symfony-icu.spec
index 052a0f9..73e18d0 100644
--- a/php-symfony-icu.spec
+++ b/php-symfony-icu.spec
@@ -12,15 +12,9 @@
 
 %global symfony_dir           %{_datadir}/php/Symfony
 
-# Tests are only run with rpmbuild --with tests
-#
-# Will be run by default when the required php-symfony-intl pkg
-# version is available
-%global with_tests  %{?_with_tests:1}%{!?_with_tests:0}
-
 Name:           php-symfony-icu
 Version:        %{github_version}
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Symfony Icu Component
 
 Group:          Development/Libraries
@@ -29,7 +23,6 @@ URL:            https://github.com/%{github_owner}/%{github_name}
 Source0:        %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
 BuildArch:      noarch
-%if %{with_tests}
 # For tests
 BuildRequires:  libicu           >= %{libicu_min_ver}
 BuildRequires:  php(language)    >= %{php_min_ver}
@@ -38,13 +31,11 @@ BuildRequires:  php-symfony-intl <  %{symfony_intl_max_ver}
 # For tests: phpcompatinfo
 Requires:       php-ctype
 Requires:       php-intl
-%endif
 
 Requires:       libicu           >= %{libicu_min_ver}
 Requires:       php(language)    >= %{php_min_ver}
-# Disabled until the required php-symfony-intl pkg version is available
-#Requires:       php-symfony-intl >= %%{symfony_intl_min_ver}
-#Requires:       php-symfony-intl <  %%{symfony_intl_max_ver}
+Requires:       php-symfony-intl >= %{symfony_intl_min_ver}
+Requires:       php-symfony-intl <  %{symfony_intl_max_ver}
 # phpcompatinfo
 Requires:       php-ctype
 Requires:       php-intl
@@ -85,7 +76,6 @@ sed -i "s#%{buildroot}##" %{name}.lang
 
 
 %check
-%if %{with_tests}
 # Create tests' autoloader
 mkdir vendor
 ( cat <<'AUTOLOADER'
@@ -106,9 +96,6 @@ cat phpunit.xml.dist \
     --include-path %{buildroot}%{_datadir}/php \
     --exclude-group tty,benchmark \
     -d date.timezone="UTC"
-%else
-: Tests skipped, missing '--with tests' option
-%endif
 
 
 %files -f %{name}.lang
@@ -128,6 +115,10 @@ cat phpunit.xml.dist \
 
 
 %changelog
+* Wed Nov 27 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.0-3
+- Tests always run
+- Require php-symfony-intl
+
 * Mon Nov 18 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.0-2
 - Renamed from "php-symfony2-icu" to "php-symfony-icu"
 - Direct libicu dependency instead of using pkgconfig