From e3ed309fe0b36b84bae65f2e587a384a83cbbbd7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Feb 2018 08:22:10 +0100 Subject: cleanup --- php-pecl-dbase.spec | 65 +++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) (limited to 'php-pecl-dbase.spec') diff --git a/php-pecl-dbase.spec b/php-pecl-dbase.spec index 0233fb7..38b786b 100644 --- a/php-pecl-dbase.spec +++ b/php-pecl-dbase.spec @@ -1,44 +1,35 @@ # remirepo spec file for php-pecl-dbase # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} -%endif %scl_package php-pecl-dbase %endif -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global with_zts 0%{?__ztsphp:1} %global pecl_name dbase -#global versuf -beta -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else +%global prever beta1 %global ini_name 40-%{pecl_name}.ini -%endif %global with_tests 0%{!?_without_tests:1} Summary: dBase database file access functions Name: %{?sub_prefix}php-pecl-dbase -Version: 5.1.1 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 7.0.0 +Release: 0.3.%{prever}%{?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 -# Created from PHP 5.2.17 tarball +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +# Created from svn +# see http://svn.php.net/viewvc?view=revision&revision=340710 Source1: http://pecl.php.net/get/%{pecl_name}-tests-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel < 7 +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -60,13 +51,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 @@ -95,8 +92,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -a1 - -mv %{pecl_name}-%{version} NTS +mv %{pecl_name}-%{version}%{?prever} NTS mv tests NTS/tests # Don't install/register tests @@ -108,8 +104,8 @@ cd NTS # Sanity check, really often broken extver=$(sed -n '/#define PHP_DBASE_VERSION/{s/.* "//;s/".*$//;p}' php_dbase.h) -if test "x${extver}" != "x%{version}%{?versuf}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?versuf}. +if test "x${extver}" != "x%{version}%{?prever}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}. exit 1 fi cd .. @@ -147,8 +143,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -169,7 +163,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%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 @@ -223,12 +217,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -243,8 +232,14 @@ rm -rf %{buildroot} %changelog -* Thu Oct 27 2016 Remi Collet - 5.1.1-1 -- update to 5.1.1 (stable) +* Tue Jul 18 2017 Remi Collet - 7.0.0-0.3.beta1.7.0 +- rebuild for PHP 7.2.0beta1 new API + +* Thu Dec 1 2016 Remi Collet - 7.0.0-0.2.beta1 +- rebuild with PHP 7.1.0 GA + +* Wed Oct 26 2016 Remi Collet - 7.0.0-0.1.beta1 +- update to 7.0.0beta1 for PHP 7 * Tue Mar 8 2016 Remi Collet - 5.1.0-2 - adapt for F24 -- cgit