summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-03-18 11:56:42 +0100
committerRemi Collet <remi@php.net>2026-03-18 11:56:42 +0100
commit5cb7129d634553f1d49ae656e6296a78de37dc09 (patch)
tree4d24a76225d0151015d82bf74ef3eca845babf14
parent2fa05bb846809bc2bf9001d73608a4d26ee2afa1 (diff)
update to 1.2.0HEADmaster
open https://github.com/valkey-io/valkey-search/issues/918 build failure
-rwxr-xr-xmakedeps.sh3
-rw-r--r--valkey-search-offline.patch14
-rw-r--r--valkey-search.spec28
3 files changed, 33 insertions, 12 deletions
diff --git a/makedeps.sh b/makedeps.sh
index e579c73..53981ac 100755
--- a/makedeps.sh
+++ b/makedeps.sh
@@ -21,7 +21,8 @@ mkdir -p $DIR
pushd $DIR
gitclone "https://github.com/google/highwayhash.git" master highwayhash
gitclone "https://github.com/google/googletest.git" main googletest
- gitclone "https://github.com/grpc/grpc" v1.70.1 grpc
+ gitclone "https://github.com/grpc/grpc" v1.70.1 grpc
+ gitclone "https://github.com/google/benchmark.git" v1.8.3 benchmark
popd
TAR=valkey-search-deps-$1.tgz
diff --git a/valkey-search-offline.patch b/valkey-search-offline.patch
index ce0a187..1087acb 100644
--- a/valkey-search-offline.patch
+++ b/valkey-search-offline.patch
@@ -1,7 +1,7 @@
diff -up ./submodules/CMakeLists.txt.offline ./submodules/CMakeLists.txt
---- ./submodules/CMakeLists.txt.offline 2025-12-24 01:21:38.000000000 +0100
-+++ ./submodules/CMakeLists.txt 2025-12-29 09:10:43.888258457 +0100
-@@ -22,7 +22,7 @@ set(MODULE_GOOGLE_TEST "googletest")
+--- ./submodules/CMakeLists.txt.offline 2026-03-17 23:26:53.000000000 +0100
++++ ./submodules/CMakeLists.txt 2026-03-18 11:03:53.917863570 +0100
+@@ -27,7 +27,7 @@ endif()
set(MODULES_INSTALL_PREFIX "${MODULES_DIR}/install")
@@ -10,7 +10,7 @@ diff -up ./submodules/CMakeLists.txt.offline ./submodules/CMakeLists.txt
function(find_and_replace file_name find_what replace_with)
-@@ -167,7 +167,7 @@ if(WITH_SUBMODULES_SYSTEM)
+@@ -178,7 +178,7 @@ if(WITH_SUBMODULES_SYSTEM)
else()
# Pull submodules with a given branch / tag and build them
checkout_submodule_branch(${MODULE_GRPC} "https://github.com/grpc/grpc"
@@ -19,12 +19,12 @@ diff -up ./submodules/CMakeLists.txt.offline ./submodules/CMakeLists.txt
string(FIND "${DISTRO_NAME}" "alpine" POSITION)
if(POSITION GREATER -1)
-@@ -187,7 +187,7 @@ else()
+@@ -198,7 +198,7 @@ else()
checkout_submodule_branch(
${MODULE_GOOGLE_TEST} "https://github.com/google/googletest.git" "main"
- "${MODULES_DIR}/googletest/build-release")
+ "${MODULES_DIR}/googletest")
- set(MODULES_COMMON_CMAKE_ARGS
- -DCMAKE_BUILD_TYPE=Release
+ if("${SAN_BUILD_LOWER}" STREQUAL "no")
+
diff --git a/valkey-search.spec b/valkey-search.spec
index 0f09369..f703ce2 100644
--- a/valkey-search.spec
+++ b/valkey-search.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for valkey-search
#
-# SPDX-FileCopyrightText: Copyright 2025 Remi Collet
+# SPDX-FileCopyrightText: Copyright 2025-2026 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
@@ -13,11 +13,10 @@
%global gh_vend valkey-io
%global gh_proj valkey-search
%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
-#global commit afe5de4ce52bb2b80af565a6f297bf330a65d0d8
%global tag %{version}
Name: valkey-search
-Version: 1.1
+Version: 1.2.0
%forgemeta
Release: 1%{?dist}
Summary: Vector Similarity Search engine
@@ -33,7 +32,7 @@ Source2: %{name}-deps-%{version}.tgz
# fix check for cached sources
Patch0: %{name}-offline.patch
-BuildRequires: valkey-devel >= 8.0
+BuildRequires: valkey-devel >= 9.0.1
BuildRequires: ninja-build
BuildRequires: cmake
BuildRequires: gcc >= 12
@@ -50,7 +49,13 @@ Supplements: valkey
Provides: bundled(highwayhash)
Provides: bundled(googletest)
+Provides: bundled(google-benchmark)
Provides: bundled(grpc) = 1.70.1
+Provides: bundled(hdrhistogram_c)
+Provides: bundled(hnswlib)
+Provides: bundled(simsimd)
+Provides: bundled(snowball)
+Provides: bundled(icu)
@@ -84,6 +89,13 @@ EOF
cp .build-release/.deps/grpc/LICENSE LICENSE.grpc
cp .build-release/.deps/highwayhash/LICENSE LICENSE.highwayhash
cp .build-release/.deps/googletest/LICENSE LICENSE.googletest
+cp .build-release/.deps/benchmark/LICENSE LICENSE.benchmark
+
+cp third_party/hdrhistogram_c/LICENSE LICENSE.hdrhistogram_c
+cp third_party/hnswlib/LICENSE LICENSE.hnswlib
+cp third_party/simsimd/LICENSE LICENSE.simsimd
+cp third_party/snowball/COPYING COPYING.snowball
+cp third_party/icu/LICENSE LICENSE.icu
: submodules list
grep -E '(github.com|"v)' submodules/CMakeLists.txt
@@ -100,12 +112,20 @@ install -Dpm640 %{cfgname} %{buildroot}%{valkey_modules_cfg}/%{c
%files
%license LICENSE*
+%license COPYING*
%doc *.md
+%doc docs
+%doc THIRD_PARTY_NOTICES
+
%attr(0640, valkey, root) %config(noreplace) %{valkey_modules_cfg}/%{cfgname}
%{valkey_modules_dir}/%{libname}
%changelog
+* Wed Mar 18 2026 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0
+- open https://github.com/valkey-io/valkey-search/issues/918 build failure
+
* Tue Dec 30 2025 Remi Collet <remi@remirepo.net> - 1.1-1
- update to 1.1