summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-05-22 14:56:00 +0200
committerRemi Collet <remi@remirepo.net>2019-05-22 14:56:00 +0200
commitc4eea6cce5ef2f86bdecdf8bf7676b58a03b2d08 (patch)
tree48721c3edb83f12a54595ecc08a6d4d59166d511
parent6c4570461a85ab26efab731a45016d6dd7f3fe46 (diff)
cleanup for 7.4
-rw-r--r--php-pecl-stomp.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/php-pecl-stomp.spec b/php-pecl-stomp.spec
index b4ffddd..2c06fb7 100644
--- a/php-pecl-stomp.spec
+++ b/php-pecl-stomp.spec
@@ -1,6 +1,6 @@
# remimrepo/fedora spec file for php-pecl-stomp
#
-# Copyright (c) 2014-2018 Remi Collet
+# Copyright (c) 2014-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -41,10 +41,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
-Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
%if "%{php_version}" > "7.1"
Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
@@ -54,9 +50,13 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "7.3"
-Obsoletes: php73u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php73-pecl-%{pecl_name} <= %{version}
Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.4"
+Obsoletes: php74-pecl-%{pecl_name} <= %{version}
+Obsoletes: php74w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -122,7 +122,11 @@ EOF
peclbuild() {
%configure \
--enable-stomp \
+%if "%{php_version}" > "7.4"
+ --with-openssl \
+%else
--with-openssl-dir=%{_root_prefix} \
+%endif
--with-libdir=%{_lib} \
--with-php-config=$1