summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-05 10:19:48 +0100
committerRemi Collet <remi@remirepo.net>2021-03-05 10:19:48 +0100
commit4cde2f81deb69c5fbb3dce18472be07684a944b6 (patch)
tree4f835ffad06368d864fea316f6a92221c18e6c81
parentae571d4c6d519bc5869e7aa946689de67ea54033 (diff)
trivial fix for PHP 8
-rw-r--r--php-horde-horde-lz4.spec57
1 files changed, 19 insertions, 38 deletions
diff --git a/php-horde-horde-lz4.spec b/php-horde-horde-lz4.spec
index 6e9fb7d..8868f98 100644
--- a/php-horde-horde-lz4.spec
+++ b/php-horde-horde-lz4.spec
@@ -3,7 +3,7 @@
#
# Fedora spec file for php-horde-horde-lz4
#
-# Copyright (c) 2014-2019 Remi Collet
+# Copyright (c) 2014-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -33,11 +33,12 @@
Summary: Horde LZ4 Compression Extension
Name: %{?sub_prefix}php-horde-horde-lz4
Version: 1.0.10
-Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 18%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: MIT
-URL: http://www.horde.org
-Source0: http://%{pecl_channel}/get/%{pecl_name}-%{version}.tgz
+URL: https://www.horde.org
+Source0: https://%{pecl_channel}/get/%{pecl_name}-%{version}.tgz
+BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
@@ -58,46 +59,17 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_channel}/%{pecl_name})%{?_isa} = %
Provides: %{?scl_prefix}php-horde-horde-lz4 = %{version}-%{release}
Provides: %{?scl_prefix}php-horde-horde-lz4%{?_isa} = %{version}-%{release}
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-Obsoletes: php53-horde-horde-lz4 <= %{version}
-Obsoletes: php53u-horde-horde-lz4 <= %{version}
-Obsoletes: php54-horde-horde-lz4 <= %{version}
-Obsoletes: php54w-horde-horde-lz4 <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-horde-horde-lz4 <= %{version}
-Obsoletes: php55w-horde-horde-lz4 <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes: php56u-horde-horde-lz4 <= %{version}
-Obsoletes: php56w-horde-horde-lz4 <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes: php70u-horde-horde-lz4 <= %{version}
-Obsoletes: php70w-horde-horde-lz4 <= %{version}
-%endif
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-horde-horde-lz4 <= %{version}
-Obsoletes: php71w-horde-horde-lz4 <= %{version}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes: php72u-horde-horde-lz4 <= %{version}
-Obsoletes: php72w-horde-horde-lz4 <= %{version}
-%endif
%if "%{php_version}" > "7.3"
-Obsoletes: php73 php74-horde-horde-lz4 <= %{version}
-Obsoletes: php73 php74w-horde-horde-lz4 <= %{version}
+Obsoletes: php73-horde-horde-lz4 <= %{version}
%endif
%if "%{php_version}" > "7.4"
-Obsoletes: php74-horde-horde-lz4 <= %{version}
-Obsoletes: php74w-horde-horde-lz4 <= %{version}
+Obsoletes: php74-horde-horde-lz4 <= %{version}
%endif
+%if "%{php_version}" > "8.0"
+Obsoletes: php80-horde-horde-lz4 <= %{version}
%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
%endif
@@ -123,6 +95,9 @@ mv %{pecl_name}-%{version} NTS
cd NTS
# Use system library
rm -r lib
+%if "%{php_version}" > "8.0"
+sed -e s/TSRMLS_CC// -i horde_lz4.c
+%endif
# Sanity check, really often broken
extver=$(sed -n '/#define HORDE_LZ4_EXT_VERSION/{s/.* "//;s/".*$//;p}' horde_lz4.h)
@@ -250,6 +225,12 @@ cd ../ZTS
%changelog
+* Fri Mar 5 2021 Remi Collet <remi@remirepo.net> - 1.0.10-18
+- trivial fix for PHP 8
+
+* Wed Apr 29 2020 Remi Collet <remi@remirepo.net> - 1.0.10-15
+- cleanup obsoletes
+
* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.0.10-7
- rebuild for 7.4.0RC1