summaryrefslogtreecommitdiffstats
path: root/php-pecl-libsodium2.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-libsodium2.spec')
-rw-r--r--php-pecl-libsodium2.spec22
1 files changed, 9 insertions, 13 deletions
diff --git a/php-pecl-libsodium2.spec b/php-pecl-libsodium2.spec
index 8dfba2c..bec3510 100644
--- a/php-pecl-libsodium2.spec
+++ b/php-pecl-libsodium2.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-libsodium
#
-# Copyright (c) 2014-2019 Remi Collet
+# Copyright (c) 2014-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -20,11 +20,11 @@
Summary: Wrapper for the Sodium cryptographic library
Name: %{?sub_prefix}php-pecl-%{proj_name}2
-Version: 2.0.22
+Version: 2.0.23
Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
-URL: http://pecl.php.net/package/%{proj_name}
-Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
+URL: https://pecl.php.net/package/%{proj_name}
+Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz
BuildRequires: %{?dtsprefix}gcc
# Ensure libsodium-last is used (1.0.9 per upstream)
@@ -49,13 +49,6 @@ Provides: %{?scl_prefix}php-pecl-%{proj_name}2 = %{version}-%{rele
Provides: %{?scl_prefix}php-pecl-%{proj_name}2%{?_isa} = %{version}-%{release}
%endif
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-pecl-%{proj_name}2 <= %{version}
-Obsoletes: php71w-pecl-%{proj_name}2 <= %{version}
-%endif
-%endif
-
# Filter shared private - always as libsodium.so is a bad name
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
@@ -79,10 +72,10 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-sed -e '/PHP_SODIUM_VERSION/s/2.0.20/%{version}/' -i php_libsodium.h
+#sed -e '/PHP_SODIUM_VERSION/s/2.0.20/%{version}/' -i php_libsodium.h
# Sanity check, really often broken
-extver=$(sed -n '/#define PHP_SODIUM_VERSION/{s/.* "//;s/".*$//;p}' php_libsodium.h)
+extver=$(sed -n '/#define PHP_LIBSODIUM_VERSION/{s/.* "//;s/".*$//;p}' php_libsodium.h)
if test "x${extver}" != "x%{version}"; then
: Error: Upstream extension version is ${extver}, expecting %{version}.
exit 1
@@ -211,6 +204,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Mon Dec 7 2020 Remi Collet <remi@remirepo.net> - 2.0.23-1
+- update to 2.0.23
+
* Sat Sep 7 2019 Remi Collet <remi@remirepo.net> - 2.0.22-1
- update to 2.0.22