diff options
| -rw-r--r-- | valkey.spec | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/valkey.spec b/valkey.spec index 6e27e38..ec8d608 100644 --- a/valkey.spec +++ b/valkey.spec @@ -4,15 +4,12 @@ # Tests fail in mock, not in local build. %bcond_with tests -# Enable RDMA module -%bcond_without rdma - # See https://github.com/valkey-io/valkey-doc/tags %global doc_version 8.1.1 Name: valkey Version: 8.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -45,9 +42,7 @@ BuildRequires: systemd-devel BuildRequires: epel-rpm-macros %endif BuildRequires: systemd-rpm-macros -%if %{with rdma} BuildRequires: rdma-core-devel -%endif BuildRequires: openssl-devel %if %{with docs} # for docs/man pages @@ -103,6 +98,8 @@ a cache. You can use Valkey from most programming languages also. +See https://valkey.io/topics/ + %package devel Summary: Development header for Valkey module development # Header-Only Library (https://fedoraproject.org/wiki/Packaging:Guidelines) @@ -112,7 +109,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Header file required for building loadable Valkey modules. - %if %{with docs} %package doc Summary: Documentation and extra man pages for %{name} @@ -123,7 +119,6 @@ License: CC-BY-SA-4.0 %summary. %endif -%if %{with rdma} %package rdma Summary: RDMA module for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -131,7 +126,18 @@ Supplements: %{name} %description rdma %summary. -%endif + +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/ %prep @@ -171,18 +177,19 @@ cat << 'EOF' | tee macros.%{name} %%valkey_modules_cfg %valkey_modules_cfg EOF -%if %{with rdma} -%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes BUILD_RDMA=module +%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=module BUILD_RDMA=module -: Configuration file +: RDMA configuration file cat << EOF | tee rdma.conf # RDMA module loadmodule %{valkey_modules_dir}/rdma.so EOF -%else -%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes BUILD_RDMA=no -%endif +: TLS configuration file +cat << EOF | tee tls.conf +# TLS module +loadmodule %{valkey_modules_dir}/tls.so +EOF %build @@ -256,10 +263,13 @@ install -pDm644 macros.%{name} %{buildroot}%{_rpmmacrodir}/macros.%{name} # Clean-up redis compatibility commands as redis package exists rm %{buildroot}%{_bindir}/redis-* -%if %{with rdma} +: RDMA install -pm755 src/valkey-rdma.so %{buildroot}%{valkey_modules_dir}/rdma.so install -pm640 rdma.conf %{buildroot}%{valkey_modules_cfg}/rdma.conf -%endif + +: TLS +install -pm755 src/valkey-tls.so %{buildroot}%{valkey_modules_dir}/tls.so +install -pm640 tls.conf %{buildroot}%{valkey_modules_cfg}/tls.conf %check @@ -319,7 +329,6 @@ exit 0 %{_mandir}/man5/%{name}.conf.5.gz %endif - %if %{with docs} %files doc %license LICENSE @@ -327,13 +336,13 @@ exit 0 %{_mandir}/man{3,7}/*%{name}*.gz %endif - -%if %{with rdma} %files rdma %attr(0640, valkey, root) %config(noreplace) %{valkey_modules_cfg}/rdma.conf %{valkey_modules_dir}/rdma.so -%endif +%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 @@ -343,8 +352,11 @@ exit 0 %changelog +* Wed Oct 1 2025 Remi Collet <remi@fedoraproject.org> - 8.1.3-6 +- add sub-package for TLS module + * Tue Sep 30 2025 Remi Collet <remi@fedoraproject.org> - 8.1.3-5 -- add sub-package for rdma module +- add sub-package for RDMA module * Wed Aug 27 2025 Remi Collet <remi@fedoraproject.org> - 8.1.3-4 - mising valkey user https://github.com/remicollet/remirepo/issues/315 |