diff options
Diffstat (limited to 'valkey.spec')
| -rw-r--r-- | valkey.spec | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/valkey.spec b/valkey.spec index 859c981..9b67f07 100644 --- a/valkey.spec +++ b/valkey.spec @@ -7,12 +7,12 @@ # See https://github.com/valkey-io/valkey-doc/tags %global doc_version 9.0.2 -%global upstream_version 9.0.3 -#global upstream_prever rc3 +%global upstream_version 9.1.0 +%global upstream_prever rc1 Name: valkey Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # libvalkey: BSD-3-Clause @@ -33,9 +33,11 @@ Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_versio Patch0: %{name}-conf.patch # Workaround to https://github.com/valkey-io/valkey/issues/2678 Patch1: %{name}-loadmod.patch -# Properly inherits linker flags for modules -# See https://github.com/valkey-io/valkey/pull/3344 -Patch2: %{name}-bindnow.patch +# clean rpath and set lua module path +Patch2: %{name}-lua.patch +# don't dlopen librdmacm libibverbs +# for proper package dependencies +Patch3: %{name}-rdma.patch ExcludeArch: %{ix86} @@ -52,7 +54,8 @@ BuildRequires: systemd-devel BuildRequires: epel-rpm-macros %endif BuildRequires: systemd-rpm-macros -BuildRequires: rdma-core-devel +BuildRequires: pkgconfig(librdmacm) +BuildRequires: pkgconfig(libibverbs) BuildRequires: openssl-devel %if %{with docs} # for docs/man pages @@ -85,6 +88,8 @@ Provides: valkey(modules_abi)%{?_isa} = %{valkey_modules_abi} # sub-package was dropped Obsoletes: valkey-tls < %{version}-%{release} Provides: valkey-tls = %{version}-%{release} +# mandatory, in main package +Provides: valkey-lua = %{version}-%{release} %description @@ -149,7 +154,8 @@ See https://valkey.io/topics/RDMA/ %setup -qn %{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}} -a50 %patch -P0 -p1 -b .rpm %patch -P1 -p1 -b .loadmod -%patch -P2 -p1 -b .bindnow +%patch -P2 -p1 -b .lua +%patch -P3 -p1 -b .rdma mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc @@ -268,8 +274,12 @@ install -pm755 src/valkey-rdma.so %{buildroot}%{valkey_modules_dir}/rdma.so install -pm640 rdma.conf %{buildroot}%{valkey_modules_cfg}/rdma.conf -%check %if %{with tests} +%check +# Search path for libvalkeylua.so +LD_LIBRARY_PATH=src/modules/lua +export LD_LIBRARY_PATH + # https://github.com/redis/redis/issues/1417 (for "taskset -c 1") taskset -c 1 ./runtest --clients 50 --skiptest "Active defrag - AOF loading" @@ -312,6 +322,7 @@ exit 0 %attr(0640, valkey, root) %config(noreplace) %{_sysconfdir}/%{name}/sentinel.conf %dir %{_libdir}/%{name} %dir %{valkey_modules_dir} +%{valkey_modules_dir}/lua.so %dir %attr(0750, valkey, valkey) %{_sharedstatedir}/%{name} %dir %attr(0750, valkey, valkey) %{_localstatedir}/log/%{name} %{_bindir}/%{name}-* @@ -344,6 +355,10 @@ exit 0 %changelog +* Tue Mar 17 2026 Remi Collet <remi@remirepo.net> - 9.1.0~rc1 +- Valkey 9.1.0-rc1 +- Lua scripting engine moved into a Valkey module + * Wed Mar 11 2026 Remi Collet <remi@remirepo.net> - 9.0.3-2 - fix module linker flags using patch from https://github.com/valkey-io/valkey/pull/3344 |