summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-09-16 09:15:17 +0200
committerRemi Collet <remi@php.net>2024-09-16 09:15:17 +0200
commit45b2205d162af906bedb03739219b5d6a919de43 (patch)
tree7d14e435aa5b9bd819da34effb262ab64dafda5d
parentef541033e21af1431416a784048cee9cd225da64 (diff)
cleanup and modernize spec file
-rw-r--r--php-pecl-redis6.spec48
1 files changed, 11 insertions, 37 deletions
diff --git a/php-pecl-redis6.spec b/php-pecl-redis6.spec
index 2445aaa..0fabe47 100644
--- a/php-pecl-redis6.spec
+++ b/php-pecl-redis6.spec
@@ -20,19 +20,17 @@
%endif
%global pecl_name redis
-%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
# after 20-json, 40-igbinary and 40-msgpack
%global ini_name 50-%{pecl_name}.ini
%global upstream_version 6.0.2
#global upstream_prever RC2
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
-%global _configure ../%{sources}/configure
Summary: Extension for communicating with the Redis key-value store
Name: php-pecl-redis6
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: PHP-3.01
URL: https://pecl.php.net/package/redis
Source0: https://pecl.php.net/get/%{sources}.tgz
@@ -79,7 +77,7 @@ Provides: php-%{pecl_name}%{?_isa} = %{version}
Provides: php-pecl(%{pecl_name}) = %{version}
Provides: php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 || "%{php_version}" > "8.4"
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 10 || "%{php_version}" > "8.4"
Obsoletes: php-pecl-%{pecl_name} < 6
Provides: php-pecl-%{pecl_name} = %{version}-%{release}
Provides: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
@@ -129,11 +127,6 @@ if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
fi
cd ..
-mkdir NTS
-%if %{with_zts}
-mkdir ZTS
-%endif
-
# Drop in the bit of configuration
cat > %{ini_name} << 'EOF'
; Enable %{pecl_name} extension module
@@ -207,34 +200,23 @@ peclconf() {
cd %{sources}
%{__phpize}
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
-cd ../NTS
peclconf %{__phpconfig}
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-peclconf %{__ztsphpconfig}
-make %{?_smp_mflags}
-%endif
+%make_build
%install
-# Install the NTS stuff
-make -C NTS install INSTALL_ROOT=%{buildroot}
+# Install the configuration file
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-%if %{with_zts}
-# Install the ZTS stuff
-make -C ZTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
# Install the package XML file
install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-# Documentation
cd %{sources}
+%make_install
+
+# Documentation
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
@@ -251,12 +233,6 @@ done
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$'
-%if %{with_zts}
-%{__ztsphp} $DEPS \
- --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
- --modules | grep '^%{pecl_name}$'
-%endif
-
%if %{with tests}
cd %{sources}/tests
@@ -310,13 +286,11 @@ exit $ret
%{php_extdir}/%{pecl_name}.so
%config(noreplace) %{php_inidir}/%{ini_name}
-%if %{with_zts}
-%{php_ztsextdir}/%{pecl_name}.so
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%endif
-
%changelog
+* Mon Sep 16 2024 Remi Collet <remi@remirepo.net> - 6.0.2-3
+- cleanup and modernize spec file
+
* Thu Jul 11 2024 Remi Collet <remi@remirepo.net> - 6.0.2-2
- use valkey on Fedora 41
- add upstream patch for PHP 8.4