diff options
| author | Remi Collet <remi@remirepo.net> | 2019-01-21 13:41:01 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-01-21 13:41:01 +0100 |
| commit | 81aee882d7de56aa3ed8654d6c60deb3a3357530 (patch) | |
| tree | 82390d9508501ba91024063bcb58b5dcf9e76a7c | |
| parent | 93f15d8a0efc56ce5b858dd5c9a186e780b164e9 (diff) | |
cleanup for EL-8
| -rw-r--r-- | php-pecl-http.spec | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 06a77cb..e0cdb34 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-http # -# Copyright (c) 2012-2017 Remi Collet +# Copyright (c) 2012-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -38,7 +38,7 @@ #global prever RC1 Name: %{?sub_prefix}php-pecl-http Version: 2.6.0 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Extended HTTP support License: BSD @@ -49,7 +49,6 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz # From http://www.php.net/manual/en/http.configuration.php Source1: %{proj_name}.ini -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel < 7 BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-iconv @@ -207,8 +206,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description @@ -295,7 +292,7 @@ NO_INTERACTION=1 \ %endif -%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 @@ -315,12 +312,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{proj_name} %config(noreplace) %{php_inidir}/%{ini_name} @@ -333,7 +325,6 @@ rm -rf %{buildroot} %endif %files devel -%defattr(-,root,root,-) %doc %{pecl_testdir}/%{proj_name} %{php_incldir}/ext/%{pecl_name} @@ -343,6 +334,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet <remi@fedoraproject.org> - 2.6.0-5 +- cleanup for EL-8 + * Fri Aug 24 2018 Remi Collet <remi@fedoraproject.org> - 2.6.0-4 - F29 skip 1 more test |