From 08864cb8034f7d3b9c9e7e43696f63ea9f708c02 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 May 2016 13:29:46 +0200 Subject: php-pecl-rrd: 2.0.1 (php 7, stable, no change) --- README | 24 ------------------------ REFLECTION-PHP7 | 2 +- php-pecl-rrd-php7.spec | 17 ++++++++--------- php-pecl-rrd.spec | 2 ++ 4 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index cd3222b..0000000 --- a/README +++ /dev/null @@ -1,24 +0,0 @@ -Old bugs (merged in version 0.10.0) -http://pecl.php.net/bugs/21132 - configure don't honor --libdir -http://pecl.php.net/bugs/21133 - Provides tests -http://pecl.php.net/bugs/21135 - declaration warnings - missing headers -http://pecl.php.net/bugs/21178 - Build against rrdtool 1.4.x - -Old bugs (merged in version 1.0.0) -http://pecl.php.net/bugs/21580 - Build fails against rrdtool 1.2.x -http://pecl.php.net/bugs/21583 - Please provides LICENSE file -http://pecl.php.net/bugs/21576 - FAIL RRDCreator test -http://pecl.php.net/bugs/21577 - rrd 0.10.0 report as 0.9.0 -http://pecl.php.net/bugs/21578 - This RRD was created on another architecture -http://pecl.php.net/bugs/21579 - FAIL rrd_info test [tests/rrd_012.phpt] -http://pecl.php.net/bugs/22586 - RFE php-strversion - -Commited but not yet published - none - -Current Bugs -http://pecl.php.net/bugs/22642 - Build logs against various rrdtool version (with failed tests) - - -Submitted for review : https://bugzilla.redhat.com/695819 - diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 index b682c03..75b1adb 100644 --- a/REFLECTION-PHP7 +++ b/REFLECTION-PHP7 @@ -1,4 +1,4 @@ -Extension [ extension #58 rrd version 2.0.0 ] { +Extension [ extension #75 rrd version 2.0.1 ] { - Functions { Function [ function rrd_update ] { diff --git a/php-pecl-rrd-php7.spec b/php-pecl-rrd-php7.spec index c43d6b8..9f669b5 100644 --- a/php-pecl-rrd-php7.spec +++ b/php-pecl-rrd-php7.spec @@ -18,18 +18,17 @@ Summary: PHP Bindings for rrdtool Name: %{?scl_prefix}php-pecl-rrd -Version: 2.0.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.1 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/rrd Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: rrdtool -BuildRequires: rrdtool-devel >= 1.3.0 +BuildRequires: pkgconfig(librrd) >= 1.3.0 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -41,8 +40,10 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?scl_prefix}" != "%{?sub_prefix}" Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff @@ -173,10 +174,6 @@ TEST_PHP_EXECUTABLE=%{_bindir}/php \ run-tests.php --show-diff -%clean -rm -rf %{buildroot} - - %if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -198,7 +195,6 @@ fi %files -%defattr(-, root, root, -) %doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} %{pecl_xmldir}/%{name}.xml @@ -213,6 +209,9 @@ fi %changelog +* Wed May 11 2016 Remi Collet - 2.0.1-1 +- update to 2.0.1 (no change) + * Sun Mar 6 2016 Remi Collet - 2.0.0-2 - adapt for F24 diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec index b620b97..3d3bf29 100644 --- a/php-pecl-rrd.spec +++ b/php-pecl-rrd.spec @@ -45,8 +45,10 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?scl_prefix}" != "%{?sub_prefix}" Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -- cgit