From 3111f47a12506b30b4cc38b33869379581fb86e3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Jul 2018 07:03:22 +0200 Subject: rebuild for 7.3.0alpha4 new ABI --- php-pecl-memcache.spec | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) (limited to 'php-pecl-memcache.spec') diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index a3098c8..0a0bffd 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -31,19 +31,19 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcache Version: 3.0.9 %if 0%{?gh_date:1} -Release: 0.9.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.11.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Patch0: %{pecl_name}-session.patch +Patch0: https://patch-diff.githubusercontent.com/raw/websupport-sk/pecl-memcache/pull/26.patch +Patch1: https://patch-diff.githubusercontent.com/raw/websupport-sk/pecl-memcache/pull/30.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: zlib-devel @@ -90,6 +90,10 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -134,8 +138,9 @@ sed -e 's/role="test"/role="src"/' \ pushd NTS %if "%{php_version}" > "7.1" -%patch0 -p1 -b .gh23 +%patch0 -p1 -b .gh26 %endif +%patch1 -p1 -b .gh30 # Chech version as upstream often forget to update this dir=php$(%{__php} -r 'echo PHP_MAJOR_VERSION;') @@ -195,6 +200,8 @@ cp -r NTS ZTS %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure --with-php-config=%{_bindir}/php-config @@ -208,7 +215,7 @@ make %{?_smp_mflags} %endif %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -273,11 +280,7 @@ exit $ret %endif -%clean -rm -rf %{buildroot} - - -%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 @@ -298,7 +301,6 @@ fi %files -%defattr(-, root, root, -) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -313,6 +315,13 @@ fi %changelog +* Wed Jul 18 2018 Remi Collet - 3.0.9-0.11.20170802.e702b5f +- rebuild for 7.3.0alpha4 new ABI + +* Fri Jun 22 2018 Remi Collet - 3.0.9-0.10.20170802.e702b5f +- add patch for PHP 7.3 from + https://github.com/websupport-sk/pecl-memcache/pull/30 + * Fri Oct 6 2017 Remi Collet - 3.0.9-0.9.20170802.e702b5f - refresh to more recent snapshot - add patch from https://github.com/websupport-sk/pecl-memcache/issues/23 -- cgit