From 32231de3d0e18bad72504faac74ecccce7cff9ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 15:27:52 +0100 Subject: cleanup for EL-8 --- php-pecl-ssh2.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec index b4bc16c..80c5e5e 100644 --- a/php-pecl-ssh2.spec +++ b/php-pecl-ssh2.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-pecl-ssh2 # with SCL compatibility # -# Copyright (c) 2011-2018 Remi Collet +# Copyright (c) 2011-2019 Remi Collet # # Fedora spec file for php-pecl-ssh2 # @@ -28,7 +28,7 @@ Name: %{?sub_prefix}php-pecl-ssh2 Version: 0.13 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Bindings for the libssh2 library %global buildver %(pkg-config --silence-errors --modversion libssh2 2>/dev/null || echo 65536) @@ -41,7 +41,6 @@ Source2: php-pecl-ssh2-0.10-README Patch0: %{pecl_name}-php5628.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libssh2-devel >= 1.2 BuildRequires: %{?scl_prefix}php-devel < 7 BuildRequires: %{?scl_prefix}php-pear @@ -141,8 +140,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description @@ -181,7 +178,7 @@ done %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 @@ -201,12 +198,8 @@ fi %endif -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -221,6 +214,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 0.13-4 +- cleanup for EL-8 + * Thu Nov 10 2016 Remi Collet - 0.13-3 - add patch for parse_url change in PHP 5.6.28 -- cgit