From bc4f32e65b8818d4ff882a5d6fdc379bcea7b5a1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 14:24:50 +0100 Subject: cleanup for EL-8 --- php-pecl-ncurses.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/php-pecl-ncurses.spec b/php-pecl-ncurses.spec index 7b3c048..2ef3bd5 100644 --- a/php-pecl-ncurses.spec +++ b/php-pecl-ncurses.spec @@ -3,19 +3,15 @@ # # Fedora spec file for php-pecl-ncurses # -# Copyright (c) 2007-2017 Remi Collet +# Copyright (c) 2007-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 -%endif %{?scl: %scl_package php-pecl-ncurses} @@ -30,7 +26,7 @@ Summary: Terminal screen handling and optimization package Name: %{?sub_prefix}php-pecl-ncurses Version: 1.0.2 -Release: 10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/ncurses @@ -41,7 +37,6 @@ Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz # URL from ncurses.c Source1: http://www.php.net/license/3_01.txt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-simplexml BuildRequires: %{?scl_prefix}php-pear @@ -138,8 +133,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description @@ -192,11 +185,7 @@ NO_INTERACTION=1 \ %endif -%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 @@ -217,7 +206,6 @@ fi %files -%defattr(-, root, root, -) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -232,6 +220,9 @@ fi %changelog +* Mon Jan 21 2019 Remi Collet - 1.0.2-11 +- cleanup for EL-8 + * Wed Mar 9 2016 Remi Collet - 1.0.2-10 - adapt for F24 -- cgit