From c5d7ebac1b586c861430303b1b282dc42c9a951b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Jun 2018 11:06:50 +0200 Subject: cleanup and rebuild --- php-pecl-selinux.spec | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/php-pecl-selinux.spec b/php-pecl-selinux.spec index 70855aa..0bafb37 100644 --- a/php-pecl-selinux.spec +++ b/php-pecl-selinux.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-pecl-selinux # adapted for SCL # -# Copyright (c) 2011-2017 Remi Collet +# Copyright (c) 2011-2018 Remi Collet # # Fedora spec file for php-pecl-selinux # @@ -12,13 +12,17 @@ # # Please, preserve the changelog entries # + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + %if 0%{?scl:1} %global sub_prefix %{scl_prefix} %scl_package php-pecl-selinux %endif %define pecl_name selinux -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini @@ -29,14 +33,13 @@ Summary: SELinux binding for PHP scripting language Name: %{?sub_prefix}php-pecl-selinux Version: 0.4.1 -Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 12%{?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} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: %{?scl_prefix}php-devel >= 5.2.0 +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: libselinux-devel >= 2.0.80 @@ -54,14 +57,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} @@ -128,6 +123,8 @@ cp -pr NTS ZTS %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -144,7 +141,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} @@ -195,11 +192,7 @@ cd ../ZTS -%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 @@ -220,7 +213,6 @@ fi %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -235,6 +227,9 @@ fi %changelog +* Fri Jun 22 2018 Remi Collet - 0.4.1-12 +- cleanup and rebuild + * Tue Jul 18 2017 Remi Collet - 0.4.1-11 - rebuild for PHP 7.2.0beta1 new API -- cgit