diff --git a/.gitignore b/.gitignore index 6b099d4..f4ec6a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ clog valkey-8.0.*.tar.gz valkey-doc-8.0.*.tar.gz +valkey-9.*.tar.gz +valkey-doc-9.*.tar.gz /valkey-doc-8.1.1.tar.gz /valkey-8.1.3.tar.gz /valkey-8.1.4.tar.gz +/valkey-8.1.5.tar.gz +/valkey-doc-8.1.5.tar.gz diff --git a/sources b/sources index 006c638..cfffa36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (valkey-8.1.4.tar.gz) = ee44a550a0868dd42ebe3b015bdc2940b00e2e2984b6870f287605399f52986ee87e957193097a07ab5da1a1194a2b7873ed1919a74c9212903f5748d722f5f0 -SHA512 (valkey-doc-8.1.1.tar.gz) = 37b664a4f07c1821df1cd83df0559127588523feef54785400fae3c2a618c93d86e9ef8bc50cc046d0904a853ae52410aa82f79413e05298f42a829b3508d2f9 +SHA512 (valkey-8.1.5.tar.gz) = ffd3d8efbd28b48351d5001a82e8bf2f28ce4c2a710c30201498391718cad77f9fa7d635ae434b2d1237ba8889613fbad16be0162992e123f7e579c840108f35 +SHA512 (valkey-doc-8.1.5.tar.gz) = 4844c0f9bcad8d98fc39039c2b820c878f777bf0bdc28ecba339b3a40e583dc20d5d30798fc4b2bcd2e6912198f71725f1270681145da58933910ed1a8628db0 diff --git a/valkey.spec b/valkey.spec index 028de35..2f5d94d 100644 --- a/valkey.spec +++ b/valkey.spec @@ -5,13 +5,13 @@ %bcond_with docs %endif # See https://github.com/valkey-io/valkey-doc/tags -%global doc_version 8.1.1 +%global doc_version 8.1.5 # Tests fail in mock, not in local build. %bcond_with tests Name: valkey -Version: 8.1.4 -Release: 2%{?dist} +Version: 8.1.5 +Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -67,6 +67,10 @@ Provides: bundled(hdr_histogram) = 0.11.0 # no version Provides: bundled(fpconv) +# sub-package was dropped +Obsoletes: valkey-tls < %{version}-%{release} +Provides: valkey-tls = %{version}-%{release} + %global valkey_modules_abi 1 %global valkey_modules_dir %{_libdir}/%{name}/modules %global valkey_modules_cfg %{_sysconfdir}/%{name}/modules @@ -120,15 +124,6 @@ Supplements: %{name} See https://valkey.io/topics/RDMA/ -%package tls -Summary: TLS module for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Supplements: %{name} - -%description tls -%summary. - -See https://valkey.io/topics/encryption/ %package compat-redis Summary: Conversion script and compatibility symlinks for Redis @@ -227,7 +222,7 @@ echo '# valkey_rpm_conf' >> valkey.conf echo '# valkey-sentinel_rpm_conf' >> sentinel.conf %endif -%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=module BUILD_RDMA=module +%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes BUILD_RDMA=module : RDMA configuration file cat << EOF | tee rdma.conf @@ -235,12 +230,6 @@ cat << EOF | tee rdma.conf loadmodule %{valkey_modules_dir}/rdma.so EOF -: TLS configuration file -cat << EOF | tee tls.conf -# TLS module -loadmodule %{valkey_modules_dir}/tls.so -EOF - %build %make_build %{make_flags} @@ -324,10 +313,6 @@ ln -sr %{buildroot}/usr/lib/systemd/system/valkey-sentinel.service %{buildroot}/ install -pm755 src/valkey-rdma.so %{buildroot}%{valkey_modules_dir}/rdma.so install -pm640 rdma.conf %{buildroot}%{valkey_modules_cfg}/rdma.conf -# TLS module -install -pm755 src/valkey-tls.so %{buildroot}%{valkey_modules_dir}/tls.so -install -pm640 tls.conf %{buildroot}%{valkey_modules_cfg}/tls.conf - %check %if %{with tests} @@ -439,10 +424,6 @@ fi %attr(0640, valkey, root) %config(noreplace) %{valkey_modules_cfg}/rdma.conf %{valkey_modules_dir}/rdma.so -%files tls -%attr(0640, valkey, root) %config(noreplace) %{valkey_modules_cfg}/tls.conf -%{valkey_modules_dir}/tls.so - %files devel # main package is not required %license COPYING @@ -461,6 +442,14 @@ fi %changelog +* Thu Dec 4 2025 Remi Collet - 8.1.5-1 +- Valkey 8.1.5 - Released Thu 04 December 2025 +- Upgrade urgency MODERATE + +* Thu Nov 27 2025 Remi Collet - 8.1.4-3 +- build TLS statically as module not supported by sentinel +- drop sub-package for TLS module + * Mon Oct 6 2025 Remi Collet - 8.1.4-2 - improve the patch for loadmodule directive