From f006cb2fef1fd94d2dae05e2153520ee0b4c2be4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 May 2019 17:14:00 +0200 Subject: rebuild using system libzstd, as 1.4.0 is now available --- php-zstd.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'php-zstd.spec') diff --git a/php-zstd.spec b/php-zstd.spec index 18809c0..a834555 100644 --- a/php-zstd.spec +++ b/php-zstd.spec @@ -17,7 +17,7 @@ %global pkg_name %{name} %endif -%if 0%{?fedora} >= 99 || 0%{?rhel} >= 99 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 %global with_libzstd 1 %else %global with_libzstd 0 @@ -32,6 +32,7 @@ %global pecl_name zstd %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini +%global buildver %(pkg-config --silence-errors --modversion libzstd 2>/dev/null || echo 65536) Summary: Zstd Extension for PHP Name: %{?sub_prefix}php-%{pecl_name} @@ -39,7 +40,7 @@ Version: 0.7.3 %if 0%{?gh_date:1} Release: 1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif %if %{?with_libzstd} License: MIT @@ -56,6 +57,7 @@ BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel %if %{?with_libzstd} BuildRequires: libzstd-devel >= %{zstdver} +Requires: libzstd%{?_isa} >= %{buildver} %else Provides: bundled(libzstd) = %{zstdver} %endif @@ -74,9 +76,13 @@ Obsoletes: php72u-%{pecl_name} <= %{version} Obsoletes: php72w-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73u-%{pecl_name} <= %{version} +Obsoletes: php73-%{pecl_name} <= %{version} Obsoletes: php73w-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.4" +Obsoletes: php74-%{pecl_name} <= %{version} +Obsoletes: php74w-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -241,6 +247,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Fri May 31 2019 Remi Collet - 0.7.3-2 +- rebuild using system libzstd, as 1.4.0 is now available + * Wed Apr 24 2019 Remi Collet - 0.7.3-1 - update to 0.7.3 -- cgit