diff options
| author | Remi Collet <remi@remirepo.net> | 2018-06-21 10:24:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-06-21 10:24:52 +0200 |
| commit | ef0cef5f6fc6a8398d7c56afb02c5c8cf87c39ce (patch) | |
| tree | 0b4932a5942843d081e903394e57306da4baf785 | |
| parent | 96fee300700a321fc8b63a331b54731dfbdc824d (diff) | |
cleanup and rebuild
| -rw-r--r-- | php-pecl-apfd.spec | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/php-pecl-apfd.spec b/php-pecl-apfd.spec index 7d175ea..3b4e823 100644 --- a/php-pecl-apfd.spec +++ b/php-pecl-apfd.spec @@ -3,18 +3,22 @@ # # Fedora spec file for php-pecl-apfd # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # 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-apfd %endif -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name apfd %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %if "%{php_version}" < "5.6" @@ -27,13 +31,12 @@ Summary: Always Populate Form Data Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.0.1 -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: BSD -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.3 BuildRequires: %{?scl_prefix}php-pear @@ -50,14 +53,6 @@ Conflicts: %{?scl_prefix}php-pecl(http) < 2.4 %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} @@ -142,8 +137,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -164,7 +157,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 @@ -213,12 +206,7 @@ cd ../ZTS %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} @@ -233,6 +221,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 21 2018 Remi Collet <remi@remirepo.net> - 1.0.1-10 +- rebuild + * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 1.0.1-9 - rebuild for PHP 7.2.0beta1 new API |