From d29a2a87399846d66a96a98a21639f6622b16afb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 21 Jan 2019 14:09:51 +0100
Subject: cleanup for EL-8

---
 php-pecl-memcached.spec | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

(limited to 'php-pecl-memcached.spec')

diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index d36f1e8..834d3d3 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -3,18 +3,14 @@
 #
 # Fedora spec file for php-pecl-memcached
 #
-# Copyright (c) 2009-2017 Remi Collet
+# Copyright (c) 2009-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%if "%{scl}" == "rh-php56"
-%global sub_prefix more-php56-
-%else
 %global sub_prefix %{scl_prefix}
-%endif
 %scl_package         php-pecl-memcached
 %else
 %global _root_prefix %{_prefix}
@@ -37,7 +33,7 @@
 Summary:      Extension to work with the Memcached caching daemon
 Name:         %{?sub_prefix}php-pecl-memcached
 Version:      2.2.0
-Release:      9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/%{pecl_name}
@@ -47,7 +43,6 @@ Source0:      http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 # https://github.com/php-memcached-dev/php-memcached/pull/151
 Patch0:       %{pecl_name}-fastlz.patch
 
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # 5.2.10 required to HAVE_JSON enabled
 BuildRequires: %{?scl_prefix}php-devel >= 5.2.10
 BuildRequires: %{?scl_prefix}php-pear
@@ -65,27 +60,8 @@ BuildRequires: fastlz-devel
 BuildRequires: memcached
 %endif
 
-%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
-Requires:      %{?sub_prefix}libevent%{_isa} > 2
-BuildRequires: %{?sub_prefix}libmemcached-devel  > 1
-Requires:      %{?sub_prefix}libmemcached-libs%{_isa} > 1
-%if %{with_fastlz}
-Requires:      fastlz%{_isa}
-%endif
-Requires:      cyrus-sasl-lib%{_isa}
-%else
 BuildRequires: libevent-devel >= 2.0.2
-%if 0%{?rhel} == 5
-BuildRequires: libmemcached-devel  > 1
-%else
-# To ensure use of libmemcached-last for --enable-memcached-protocol
 BuildRequires: libmemcached-devel  >= 1.0.16
-%endif
-%endif
 
 Requires:     %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:     %{?scl_prefix}php(api) = %{php_core_api}
@@ -258,11 +234,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%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
@@ -338,7 +310,6 @@ exit $ret
 
 
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -353,6 +324,9 @@ exit $ret
 
 
 %changelog
+* Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 2.2.0-10
+- cleanup for EL-8
+
 * Tue Apr 12 2016 Remi Collet <remi@fedoraproject.org> - 2.2.0-9
 - fix dependencies for more-php5*
 
-- 
cgit