From d432a2d46b2df52eab0258f67b1f31ecec7854ad Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 May 2017 08:37:54 +0200 Subject: switch the spec --- php-pecl-stomp.spec | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'php-pecl-stomp.spec') diff --git a/php-pecl-stomp.spec b/php-pecl-stomp.spec index c410cf8..b06de50 100644 --- a/php-pecl-stomp.spec +++ b/php-pecl-stomp.spec @@ -11,25 +11,20 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name stomp -%if "%{php_version}" < "5.6" -# After sockets -%global ini_name %{pecl_name}.ini -%else -# After 20-sockets %global ini_name 40-%{pecl_name}.ini -%endif Summary: Stomp client extension Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.0.9 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 2.0.0 +Release: 4%{?dist}%{!?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 +Patch0: %{pecl_name}-upstream.patch + +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: openssl-devel @@ -41,8 +36,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} && 0%{?rhel} # Other third party repo stuff @@ -50,13 +47,15 @@ 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 %endif @@ -87,6 +86,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_STOMP_VERSION/{s/.* "//;s/".*$//;p}' php_stomp.h) @@ -141,8 +141,6 @@ peclbuild %{_bindir}/zts-php-config %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -199,12 +197,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -219,6 +212,18 @@ rm -rf %{buildroot} %changelog +* Thu Dec 1 2016 Remi Collet - 2.0.0-4 +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet - 2.0.0-3 +- rebuild for PHP 7.1 new API version + +* Fri Jun 10 2016 Remi Collet - 2.0.0-2 +- add upstream patch for PHP 7.1 + +* Thu May 26 2016 Remi Collet - 2.0.0-1 +- update to 2.0.0 (php 7, beta) + * Tue Mar 8 2016 Remi Collet - 1.0.9-2 - adapt for F24 -- cgit