diff options
| -rw-r--r-- | php-pecl-json-post.spec | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/php-pecl-json-post.spec b/php-pecl-json-post.spec index 99eb062..905008b 100644 --- a/php-pecl-json-post.spec +++ b/php-pecl-json-post.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-json-post # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -14,7 +14,7 @@ %scl_package php-pecl-json-post %endif -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name json_post %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %if "%{php_version}" < "5.6" @@ -31,12 +31,11 @@ Name: %{?sub_prefix}php-pecl-json-post Version: 1.0.1 Release: 8%{?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: %{?scl_prefix}php-devel > 5.3 +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-pear @@ -56,14 +55,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} @@ -134,6 +125,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -152,7 +145,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -174,7 +167,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 @@ -227,12 +220,7 @@ cd ../ZTS %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} @@ -247,6 +235,9 @@ rm -rf %{buildroot} %changelog +* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 1.0.1-9 +- cleanup + * Tue Oct 3 2017 Remi Collet <remi@remirepo.net> - 1.0.1-8 - F27: release bump |