From 46156a393c33dc48ffdb77bc056cedda3ea59751 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 May 2018 06:16:59 +0200 Subject: manage update from other 3rd party repo --- php-pecl-mcrypt.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/php-pecl-mcrypt.spec b/php-pecl-mcrypt.spec index bb55055..b0756f3 100644 --- a/php-pecl-mcrypt.spec +++ b/php-pecl-mcrypt.spec @@ -1,11 +1,15 @@ # remirepo spec file for php-pecl-mcrypt # -# Copyright (c) 2018 Remi Collet +# Copyright (c) 2017-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + %{?scl: %scl_package php-pecl-mcrypt} %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} @@ -15,13 +19,14 @@ Summary: Bindings for the libmcrypt library Name: %{?scl_prefix}php-pecl-mcrypt Version: 1.0.1 -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mcrypt Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7.2 BuildRequires: libmcrypt-devel BuildRequires: %{?scl_prefix}php-pear @@ -36,6 +41,16 @@ Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version}-%{release} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version}-%{release} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +Obsoletes: php54u-%{pecl_name} <= %{version} +Obsoletes: php54w-%{pecl_name} <= %{version} +Obsoletes: php55u-%{pecl_name} <= %{version} +Obsoletes: php55w-%{pecl_name} <= %{version} +Obsoletes: php56u-%{pecl_name} <= %{version} +Obsoletes: php56w-%{pecl_name} <= %{version} +Obsoletes: php70u-%{pecl_name} <= %{version} +Obsoletes: php70w-%{pecl_name} <= %{version} +Obsoletes: php71u-%{pecl_name} <= %{version} +Obsoletes: php71w-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif @@ -165,7 +180,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %endif -%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 @@ -200,6 +215,9 @@ fi %changelog +* Mon May 28 2018 Remi Collet - 1.0.1-6 +- manage update from other 3rd party repo + * Wed Jan 10 2018 Remi Collet - 1.0.1-5 - use run-tests.php instead of make test -- cgit