From 7f12d7f6ffa755215f38709a6e61b59dfa11b291 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 28 Sep 2017 10:52:11 +0200
Subject: allow install of both v1 and v2 extensions

---
 php.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/php.spec b/php.spec
index 09615d8..fc7c71e 100644
--- a/php.spec
+++ b/php.spec
@@ -235,6 +235,8 @@ BuildRequires: %{?dtsprefix}systemtap-sdt-devel
 %if 0%{?gh_date}
 BuildRequires: bison
 %endif
+BuildRequires: /bin/ps
+
 Requires: httpd-mmn = %{_httpd_mmn}
 Provides: %{?scl_prefix}mod_php = %{version}-%{release}
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
@@ -886,7 +888,6 @@ BuildRequires:  pkgconfig(libsodium) >= 1.0.13
 
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 # not provided as API is different
-Obsoletes: %{?scl_prefix}php-pecl-libsodium  < 7
 Obsoletes: %{?scl_prefix}php-pecl-libsodium2 < 7
 Provides:  %{?scl_prefix}php-pecl(libsodium)         = %{version}
 Provides:  %{?scl_prefix}php-pecl(libsodium)%{?_isa} = %{version}
-- 
cgit