From 97a709063849823de0ec16b8841e147f313e62f1 Mon Sep 17 00:00:00 2001 From: Vitaly Chikunov Date: Fri, 21 Nov 2025 21:47:02 +0300 Subject: [PATCH] spec: Remove llama.cpp-convert package No point to provide it and require install of requirements from pip. Signed-off-by: Vitaly Chikunov --- .gear/llama.cpp.spec | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/.gear/llama.cpp.spec b/.gear/llama.cpp.spec index fbdbfbb82..dbc7ec4ff 100644 --- a/.gear/llama.cpp.spec +++ b/.gear/llama.cpp.spec @@ -20,7 +20,6 @@ Group: Sciences/Computer science Url: https://github.com/ggerganov/llama.cpp ExcludeArch: %ix86 Requires: %name-cpu = %EVR -Requires: %name-convert = %EVR %if_with cuda Requires: %name-cuda = %EVR %filter_from_requires /(libcudart\.so\.12)/d @@ -106,6 +105,8 @@ Requires: libllama = %EVR Summary: %name tools including backend for CPU Group: Sciences/Computer science Requires: libllama = %EVR +Conflicts: %name-convert < %EVR +AutoReqProv: nopython3 %add_findreq_skiplist %_datadir/%name/examples/* %description cpu @@ -128,22 +129,6 @@ Requires: %name-cpu = %EVR %description vulkan %summary. -%package convert -Summary: %name model converters to GGUF -Group: Sciences/Computer science -AutoReqProv: nopython3 -Requires: python3(pip) - -%description convert -The main model format conversion script is unsupported and provided AS IS. -Other scripts are legacy and unmaintained. - -For the scripts to work you will need to: - - pip3 install -r /usr/share/llama.cpp/requirements.txt - -or install individually from the separate requirements files. - %prep %setup %autopatch -p1 @@ -221,6 +206,8 @@ llama-cli --version |& grep -Ex 'version: %version \(\S+ \[%release\]\)' llama-cli -m %_datadir/tinyllamas/stories260K.gguf -p "Hello" -s 42 -n 500 llama-cli -m %_datadir/tinyllamas/stories260K.gguf -p "Once upon a time" -s 55 -n 33 | grep 'Once upon a time, there was a boy named Tom. Tom had a big box of colors.' +# We do not provide convert tools. +mv %buildroot%_bindir/convert*.py -t %buildroot%_datadir/%name/examples %files @@ -250,6 +237,8 @@ llama-cli -m %_datadir/tinyllamas/stories260K.gguf -p "Once upon a time" -s 55 - %dir %_datadir/%name %dir %_datadir/%name/examples %_datadir/%name/examples/*.sh +%_datadir/%name/examples/*.py +%_datadir/%name/requirements* %_datadir/%name/grammars %dir %_libexecdir/llama %_libexecdir/llama/libggml-cpu*.so @@ -268,13 +257,6 @@ llama-cli -m %_datadir/tinyllamas/stories260K.gguf -p "Once upon a time" -s 55 - %_libexecdir/llama/libggml-vulkan.so %endif -%files convert -%_bindir/convert*.py -%dir %_datadir/%name -%dir %_datadir/%name/examples -%_datadir/%name/examples/*.py -%_datadir/%name/requirements* - %changelog * Tue Oct 28 2025 Vitaly Chikunov 1:6869-alt1 - Update to b6869 (2025-10-28).