summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-pecl-ssh2.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec
index 28c0cf4..2eea3b9 100644
--- a/php-pecl-ssh2.spec
+++ b/php-pecl-ssh2.spec
@@ -19,7 +19,6 @@
%global gh_project pecl-networking-ssh2
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name ssh2
-%global ini_name 40-%{pecl_name}.ini
%global buildver %(pkg-config --silence-errors --modversion libssh2 2>/dev/null || echo 65536)
Name: %{?scl_prefix}php-pecl-ssh2
@@ -29,7 +28,7 @@ Version: 1.4
Release: 0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
%else
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
%endif
@@ -47,10 +46,13 @@ Requires: %{vendeur}-libssh2%{?_isa} >= 1.10
# Disable RPATH check
%global __arch_install_post /bin/true
%global __brp_check_rpaths /bin/true
+# Ensure ssh2 is loaded before curl
+%global ini_name 19-%{pecl_name}.ini
%else
%global move_to_opt 0
BuildRequires: libssh2-devel >= 1.10
Requires: libssh2%{?_isa} >= %{buildver}
+%global ini_name 40-%{pecl_name}.ini
%endif
@@ -238,6 +240,10 @@ fi
%changelog
+* Tue May 2 2023 Remi Collet <remi@remirepo.net> - 1.4-2
+- EL-7 and EL-8: rename 40-ssh2.ini to 19-ssh2.ini to ensure
+ ssh2 extension is loaded before curl extension
+
* Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 1.4-1
- update to 1.4