From deaf1df90d9cbe228c4ecda8106155f78abfc026 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Dec 2019 08:15:31 +0100 Subject: v2.0.3 --- php-pecl-svn.spec | 65 ++++++++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 42 deletions(-) (limited to 'php-pecl-svn.spec') diff --git a/php-pecl-svn.spec b/php-pecl-svn.spec index 619e9de..70d34bf 100644 --- a/php-pecl-svn.spec +++ b/php-pecl-svn.spec @@ -1,48 +1,34 @@ # remirepo spec file for php-pecl-svn # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2019 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-svn %endif %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name svn -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else -%global ini_name 40-%{pecl_name}.ini -%endif +%global ini_name 40-%{pecl_name}.ini Summary: PHP Bindings for the Subversion Revision control system Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.0.3 +Version: 2.0.3 Release: 1%{?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 -# From headers -Source1: http://www.php.net/license/3_01.txt - -# http://svn.php.net/viewvc?view=revision&revision=339128 - for apr < 1.5 -# http://svn.php.net/viewvc?view=revision&revision=339129 - fix ZTS -Patch0: %{pecl_name}-upstream.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: subversion-devel >= 1.3 BuildRequires: neon-devel +BuildRequires: apr-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -60,21 +46,17 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -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} +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.3" +Obsoletes: php73-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.4" +Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -104,10 +86,6 @@ sed -e 's/role="test"/role="src"/' \ cd NTS -cp %{SOURCE1} LICENSE -%patch0 -p3 -b .up -chmod -x *.c *.h - # Sanity check, really often broken extver=$(sed -n '/#define PHP_SVN_VERSION/{s/.* "//;s/".*$//;p}' php_svn.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -129,6 +107,8 @@ EOF %build +%{?dtsenable} + peclbuild() { %configure \ --with-svn \ @@ -149,7 +129,7 @@ peclbuild %{_bindir}/zts-php-config %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -173,7 +153,7 @@ done %{!?_licensedir:install -Dpm 644 NTS/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 @@ -209,12 +189,7 @@ cd ../ZTS %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -229,6 +204,12 @@ rm -rf %{buildroot} %changelog +* Mon Dec 16 2019 Remi Collet - 2.0.3-1 +- update to 2.0.3 for PHP 7 + +* Mon Jan 21 2019 Remi Collet - 1.0.3-2 +- cleanup for EL-8 + * Wed May 4 2016 Remi Collet - 1.0.3-1 - initial package, version 1.0.3 (stable) - fix sources permission (upstream rev 339125) -- cgit