summaryrefslogtreecommitdiffstats
path: root/php-pecl-trie.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-trie.spec')
-rw-r--r--php-pecl-trie.spec41
1 files changed, 15 insertions, 26 deletions
diff --git a/php-pecl-trie.spec b/php-pecl-trie.spec
index 461bee1..d71d075 100644
--- a/php-pecl-trie.spec
+++ b/php-pecl-trie.spec
@@ -1,8 +1,8 @@
# remirepo spec file for php-pecl-trie
#
-# Copyright (c) 2020-2023 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2024-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -18,13 +18,15 @@
Summary: PHP Trie extension
Name: %{?scl_prefix}php-pecl-trie
Version: 0.1.2
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP-3.01
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{sources}.tgz
# headers only library
Source1: https://github.com/Tessil/hat-trie/archive/v%{libver}.tar.gz
+Patch0: 10.patch
+
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.3
@@ -56,10 +58,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
- %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -e '/LICENSE/s/role="doc"/role="src"/' \
-i package.xml
cd %{sources}
+%patch -P0 -p1
+
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_TRIE_EXT_EXTVER/{s/.* "//;s/".*$//;p}' php_trie_ext.h)
if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -132,26 +136,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%check
cd %{sources}
OPT="-n"
@@ -180,7 +164,7 @@ TEST_PHP_ARGS="$OPT -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \
%files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -194,6 +178,11 @@ TEST_PHP_ARGS="$OPT -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \
%changelog
+* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 0.1.2-3
+- add fixes for PHP 8.5.0alpha2 using patch from
+ https://github.com/ace411/php-trie-ext/pull/10
+- re-license spec file to CECILL-2.1
+
* Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 0.1.2-2
- build out of sources tree