From 039663f6a4b23a1e5079ec6c8a356e0a2e520cc7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 14:01:51 +0100 Subject: cleanup for EL-8 --- php-pecl-lua.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/php-pecl-lua.spec b/php-pecl-lua.spec index ec76dfc..c3783ea 100644 --- a/php-pecl-lua.spec +++ b/php-pecl-lua.spec @@ -1,6 +1,6 @@ # spec file for php-pecl-lua # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -27,7 +27,7 @@ Summary: Embedded lua interpreter Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.1.0 -Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -39,7 +39,6 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz # https://github.com/laruence/php-lua/pull/7 Patch0: %{pecl_name}-build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lua-devel BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -145,8 +144,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS \ install INSTALL_ROOT=%{buildroot} @@ -172,7 +169,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%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 @@ -222,12 +219,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -241,6 +233,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 1.1.0-7 +- cleanup for EL-8 + * Tue Mar 8 2016 Remi Collet - 1.1.0-6 - adapt for F24 - drop runtime dependency on pear, new scriptlets -- cgit