From af6a47388c8cf4864ae1f7d27e04ee8de99437b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jun 2017 13:55:22 +0200 Subject: ensure we use libevent2 on EL-6 --- php-pecl-event.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/php-pecl-event.spec b/php-pecl-event.spec index d51ebb6..1544f11 100644 --- a/php-pecl-event.spec +++ b/php-pecl-event.spec @@ -31,7 +31,7 @@ Summary: Provides interface to libevent library Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 2.3.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/event @@ -41,17 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel > 5.4 BuildRequires: %{?scl_prefix}php-pear -%if 0%{?scl:1} && 0%{?fedora} < 15 && 0%{?rhel} < 7 && "%{?scl_vendor}" != "remi" -# Filter in the SCL collection -%{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so} -# libvent from SCL as not available in system -BuildRequires: %{?sub_prefix}libevent-devel >= 2.0.2 -Requires: %{?sub_prefix}libevent%{_isa} >= 2.0.2 -%global _event_prefix %{_prefix} -%else -BuildRequires: libevent-devel >= 2.0.2 +BuildRequires: pkgconfig(libevent) >= 2 %global _event_prefix %{_root_prefix} -%endif BuildRequires: openssl-devel BuildRequires: pkgconfig @@ -92,6 +83,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version} Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -285,6 +280,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 23 2017 Remi Collet - 2.3.0-3 +- ensure we use libevent2 on EL-6 + * Mon Mar 27 2017 Remi Collet - 2.3.0-2 - F26: rebuild with new libevent and test suite fully enabled -- cgit