diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-08-31 14:41:28 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-08-31 14:41:28 +0200 |
| commit | 15d2bf7aeb5f37a7f46a57df1b21f4436fc32fc9 (patch) | |
| tree | f29bbec842ea27cf8bde06eaa871c10e2f872a73 | |
| parent | 8bb310df9aab2f3a00b1f8a2c052016bc14e6b1a (diff) | |
php-pecl-rrd: fix F23 build
| -rw-r--r-- | php-pecl-rrd.spec | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec index e9f4aeb..dc0aa29 100644 --- a/php-pecl-rrd.spec +++ b/php-pecl-rrd.spec @@ -26,7 +26,7 @@ Summary: PHP Bindings for rrdtool Name: %{?scl_prefix}php-pecl-rrd Version: 1.1.3 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 License: BSD Group: Development/Languages URL: http://pecl.php.net/package/rrd @@ -145,11 +145,16 @@ cd NTS --modules | grep %{pecl_name} -%if 0%{?fedora} < 14 && 0%{?rhel} < 7 - # skip tests which only succeed with rrdtool > 1.4.0 - rm tests/rrd_012.phpt \ - tests/rrd_017.phpt -%endif +if pkg-config librrd --atleast-version=1.5.0 +then + : ignore test failed with rrdtool gt 1.5 + rm tests/rrd_{016,017}.phpt +fi +if ! pkg-config librrd --atleast-version=1.4.0 +then + : ignore test failed with rrdtool lt 1.4 + rm tests/rrd_{012,017}.phpt +fi make -C tests/data clean make -C tests/data all @@ -193,7 +198,10 @@ fi %changelog -* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 0.8.0-1.1 +* Mon Aug 31 2015 Remi Collet <remi@fedoraproject.org> - 1.1.3-4 +- F23 build + +* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.1.3-3 - Fedora 21 SCL mass rebuild * Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.3-3 |