diff options
author | Remi Collet <fedora@famillecollet.com> | 2015-02-28 08:59:12 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2015-02-28 08:59:12 +0100 |
commit | b3b8a3e8751a25d6a4cf07e9c31300ad7103b720 (patch) | |
tree | b1da591645f9924f69f7f2e60f624f6eeeb1023c | |
parent | 750e69cc8eeb39b6c2dd463cb7a8da848635dcce (diff) |
php-pecl-geoip: fix F22 build
-rw-r--r-- | php-pecl-geoip.spec | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/php-pecl-geoip.spec b/php-pecl-geoip.spec index 540b15c..e85f85d 100644 --- a/php-pecl-geoip.spec +++ b/php-pecl-geoip.spec @@ -14,7 +14,7 @@ Name: %{?scl_prefix}php-pecl-geoip Version: 1.1.0 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: Extension to map IP addresses to geographic places Group: Development/Languages License: PHP @@ -148,13 +148,19 @@ done %endif cd NTS +%if 0%{?fedora} > 21 +# TODO America/Toronto instead of America/Montreal +rm tests/013.phpt +%endif + TEST_PHP_EXECUTABLE=%{__php} \ REPORT_EXIT_STATUS=1 \ NO_INTERACTION=1 \ %{__php} run-tests.php \ -n -q \ -d extension_dir=modules \ - -d extension=%{pecl_name}.so + -d extension=%{pecl_name}.so \ + --show-diff %clean @@ -184,6 +190,9 @@ fi %changelog +* Sat Feb 28 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-3 +- ignore 1 test on Fedora >= 22 + * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.1.0-2.1 - Fedora 21 SCL mass rebuild |