From 220ab638407da6e6f7509812c187d2c788cc4717 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Jul 2018 09:09:44 +0200 Subject: rebuild for 7.3.0alpha4 new ABI --- php-phpiredis.spec | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/php-phpiredis.spec b/php-phpiredis.spec index 0d15596..955f63f 100644 --- a/php-phpiredis.spec +++ b/php-phpiredis.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-phpiredis # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -30,25 +30,26 @@ Name: %{?sub_prefix}php-%{pecl_name} Version: 1.0.0 %if 0%{?gh_date} -Release: 0.3.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.4.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif Summary: Client extension for Redis -Group: Development/Languages License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear # ensure we use hiredis-last when exists BuildRequires: hiredis-devel >= 0.13.3 %if %{with_tests} BuildRequires: redis +# Workaround +BuildRequires: jemalloc %endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -62,12 +63,6 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -%if "%{php_version}" > "5.5" -Obsoletes: php55u-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "5.6" Obsoletes: php56u-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} @@ -92,6 +87,12 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-%{pecl_name} <= %{version} +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -135,6 +136,8 @@ cp -pr NTS ZTS %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure --with-php-config=%{_bindir}/php-config @@ -149,7 +152,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -218,12 +221,7 @@ exit $ret %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-, root, root, -) %{!?_licensedir:%global license %%doc} %license NTS/LICENSE %doc NTS/README.md @@ -238,6 +236,12 @@ rm -rf %{buildroot} %changelog +* Wed Jul 18 2018 Remi Collet - 1.0.0-8 +- rebuild for 7.3.0alpha4 new ABI + +* Wed Jun 27 2018 Remi Collet - 1.0.0-7 +- cleanup + * Tue Oct 3 2017 Remi Collet - 1.0.0-6 - F27: release bump -- cgit