From 5cb630d3000677fb9b8c359bad94c8b0d3737e22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Feb 2018 10:45:08 +0100 Subject: cleanup --- php-pecl-stats.spec | 76 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 33 deletions(-) (limited to 'php-pecl-stats.spec') diff --git a/php-pecl-stats.spec b/php-pecl-stats.spec index 30f9d85..df605cc 100644 --- a/php-pecl-stats.spec +++ b/php-pecl-stats.spec @@ -1,32 +1,30 @@ # spec file for php-pecl-stats # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + %{?scl: %scl_package php-pecl-stats} -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name stats -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else %global ini_name 40-%{pecl_name}.ini -%endif Summary: Routines for statistical computation Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.0.5 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.3 +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -48,13 +46,19 @@ Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -103,6 +107,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -123,7 +129,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -144,10 +150,9 @@ cd NTS for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%{!?_licensedir:install -Dpm 644 LICENSE %{buildroot}%{pecl_docdir}/%{pecl_name}/LICENSE} -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -171,12 +176,12 @@ fi : Minimal load test for NTS extension cd NTS %{_bindir}/php --no-php-ini \ - --define extension=modules/%{pecl_name}.so \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{_bindir}/php -n run-tests.php --show-diff @@ -186,28 +191,22 @@ REPORT_EXIT_STATUS=1 \ : Minimal load test for ZTS extension cd ../ZTS %{__ztsphp} --no-php-ini \ - --define extension=modules/%{pecl_name}.so \ + --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__ztsphp} -n run-tests.php --show-diff %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml - %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -218,18 +217,29 @@ rm -rf %{buildroot} %changelog -* Thu Jun 2 2016 Remi Collet - 1.0.5-1 -- update to 1.0.5 (php 5, stable) +* Tue Jul 18 2017 Remi Collet - 2.0.3-4 +- rebuild for PHP 7.2.0beta1 new API + +* Thu Dec 1 2016 Remi Collet - 2.0.3-3 +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet - 2.0.3-2 +- rebuild for PHP 7.1 new API version + +* Thu Jun 2 2016 Remi Collet - 2.0.3-1 +- update to 2.0.3 (php 7, stable) -* Sat May 28 2016 Remi Collet - 1.0.4-1 -- update to 1.0.4 (php 5, stable) +* Sat May 28 2016 Remi Collet - 2.0.2-1 +- update to 2.0.2 (php 7, stable) -* Tue Mar 8 2016 Remi Collet - 1.0.3-6 +* Sun Mar 6 2016 Remi Collet - 2.0.1-2 - adapt for F24 -* Sat Jan 2 2016 Remi Collet - 1.0.3-5 +* Sat Jan 2 2016 Remi Collet - 2.0.1-1 +- update to 2.0.1 (php 7, stable) - don't install/register tests - drop runtime dependency on pear, new scriptlets +- LICENSE is provided by upstream (PHP 3.01) * Wed Dec 24 2014 Remi Collet - 1.0.3-4.1 - Fedora 21 SCL mass rebuild -- cgit