build TLS statically

drop sub-package for TLS module

1 files changed, 12 insertions, 27 deletions

diff --git a/valkey.spec b/valkey.spec
index 17ccb9c..fa45861 100644
--- a/valkey.spec
+++ b/valkey.spec
@@ -9,7 +9,7 @@
 
 Name:              valkey
 Version:           8.1.4
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A persistent key-value database
 # valkey: BSD-3-Clause
 # hiredis: BSD-3-Clause
@@ -31,6 +31,8 @@ Patch0:            %{name}-conf.patch
 # Workaround to https://github.com/valkey-io/valkey/issues/2678
 Patch1:            %{name}-loadmod.patch
 
+ExcludeArch:       %{ix86}
+
 BuildRequires:     make
 BuildRequires:     gcc
 %if %{with tests}
@@ -73,7 +75,10 @@ Provides:          bundled(fpconv)
 %global valkey_modules_cfg %{_sysconfdir}/%{name}/modules
 Provides:          valkey(modules_abi)%{?_isa} = %{valkey_modules_abi}
 
-ExcludeArch:       %{ix86}
+# sub-package was dropped
+Obsoletes:         valkey-tls  < %{version}-%{release}
+Provides:          valkey-tls  = %{version}-%{release}
+
 
 %description
 Valkey is an advanced key-value store. It is often referred to as a data
@@ -131,16 +136,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/
-
 
 %prep
 # no autosetup due to no support for multiple source extraction
@@ -180,7 +175,7 @@ cat << 'EOF' | tee macros.%{name}
 %%valkey_modules_cfg %valkey_modules_cfg
 EOF
 
-%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
@@ -188,12 +183,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}
@@ -270,10 +259,6 @@ rm %{buildroot}%{_bindir}/redis-*
 install -pm755 src/valkey-rdma.so %{buildroot}%{valkey_modules_dir}/rdma.so
 install -pm640 rdma.conf          %{buildroot}%{valkey_modules_cfg}/rdma.conf
 
-: TLS
-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}
@@ -343,10 +328,6 @@ exit 0
 %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
@@ -355,6 +336,10 @@ exit 0
 
 
 %changelog
+* Thu Nov 27 2025 Remi Collet <remi@fedoraproject.org> - 8.1.4-3
+- build TLS statically
+- drop sub-package for TLS module
+
 * Mon Oct  6 2025 Remi Collet <remi@fedoraproject.org> - 8.1.4-2
 - improve the patch for loadmodule directive