[rpms/ollama] rawhide: Update to 0.24.0

[rpms/ollama] rawhide: Update to 0.24.0

[Tom Rix]

            A new commit has been pushed.

            Repo   : rpms/ollama
            Branch : rawhide
            Commit : 6bfbe89b21a77027f980373639b4c39fd1cad532
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-07-04T08:04:05-07:00
            Stats  : +87/-7 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/ollama/c/6bfbe89b21a77027f980373639b4c39fd1cad532?branch=rawhide

            Log:
            Update to 0.24.0

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/.gitignore b/.gitignore
index 92cc104..61af656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
 /ollama-0.22.1-vendor.tar.bz2
 /ollama-0.23.4.tar.gz
 /ollama-0.23.4-vendor.tar.bz2
+/ollama-0.24.0.tar.gz
+/ollama-0.24.0-vendor.tar.bz2

diff --git a/ollama.service b/ollama.service
index 467f014..36edc13 100644
--- a/ollama.service
+++ b/ollama.service
@@ -20,6 +20,9 @@ Environment="OLLAMA_HOST=127.0.0.1:11434"
 #Environment="OLLAMA_HOST=0.0.0.0:11434"
 #Environment="OLLAMA_HOST=[::]:11434"
 
+# So iGPU will be used
+Environment="OLLAMA_IGPU_ENABLE=1"
+
 ExecStart=/usr/bin/ollama serve
 User=ollama
 Group=ollama

diff --git a/ollama.spec b/ollama.spec
index fa1c41c..9efbb94 100644
--- a/ollama.spec
+++ b/ollama.spec
@@ -19,7 +19,11 @@ ExcludeArch:    ppc64le s390x
 
 # https://github.com/ollama/ollama
 %global goipath         github.com/ollama/ollama
-Version:                0.23.4
+%if %{with next}
+Version:                0.30.11
+%else
+Version:                0.24.0
+%endif
 
 %gometa -L -f
 
@@ -39,16 +43,19 @@ Source10:       ollama.service
 Source11:       ollama.sysusers
 %endif
 
+%if %{with next}
+Patch1:         0001-ollama-OLLAMA_USE_SYSTEM_LLAMA_CPP.patch
+%else
 Patch1:         0001-ollama-handle-load.patch
+%endif
 
 BuildRequires:  go-vendor-tools
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-
-%if %{with systemd}
-BuildRequires:  systemd-rpm-macros
-%endif
+%if %{with next}
+BuildRequires:  llama-cpp-devel
+%else
 
 %if %{with rocm}
 BuildRequires:  hipblas-devel
@@ -66,6 +73,25 @@ BuildRequires:  vulkan-loader-devel
 BuildRequires:  glslc
 %endif
 
+%endif
+
+%if %{with systemd}
+BuildRequires:  systemd-rpm-macros
+%endif
+
+%if %{with next}
+
+Requires:        llama-cpp
+Obsoletes:       ollama-base < 0.30.0
+Obsoletes:       ollama-rocm < 0.30.0
+Obsoletes:       ollama-vulkan < 0.30.0
+
+%if %{with systemd}
+%{?systemd_requires}
+%endif
+
+%else
+
 Requires:       %{name}-base%{?_isa} = %{version}-%{release}
 %if %{with rocm}
 Requires:       %{name}-rocm%{?_isa} = %{version}-%{release}
@@ -74,9 +100,12 @@ Requires:       %{name}-rocm%{?_isa} = %{version}-%{release}
 Requires:       %{name}-vulkan%{?_isa} = %{version}-%{release}
 %endif
 
+%endif
+
 %description
 Get up and running with OpenAI gpt-oss, DeepSeek-R1, Gemma 3 and other models.
 
+%if %{without next}
 %package base
 Summary:        The base ollama
 %if %{with systemd}
@@ -104,6 +133,7 @@ Summary:        The Vulkan backend for ollama
 %{summary}
 %endif
 
+%endif
 
 %prep
 %goprep -A
@@ -115,10 +145,12 @@ mv app/README.md app-README.md
 mv integration/README.md integration-README.md
 mv llama/README.md llama-README.md
 
+%if %{without next}
 # No knob to turn off vulkan
 %if %{without vulkan}
 sed -i -e 's@Vulkan_FOUND@FALSE@' CMakeLists.txt
 %endif
+%endif
 
 # web-search ollama plugins are not working well
 # Here is what they do https://docs.ollama.com/capabilities/web-search
@@ -133,18 +165,31 @@ sed -i '/if ensureWebSearchPlugin()/,+2d' cmd/launch/openclaw.go
 # For pi.go
 sed -i '/ensurePiWebSearchPackage(bin)/d' cmd/launch/pi.go
 
+%if %{with next}
+# sqlite3-binding.c:123934:9: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
+sed -i 's@zTail = strrchr@zTail = (char \*)strrchr@' vendor/github.com/mattn/go-sqlite3/sqlite3-binding.c
+%endif
 
 %generate_buildrequires
 %go_vendor_license_buildrequires -c %{S:2}
 
 %build
 
+%if %{with next}
+
+%cmake \
+    -DOLLAMA_USE_SYSTEM_LLAMA_CPP=ON
+
+%else
+
 %cmake \
 %if %{with rocm}
     -DCMAKE_HIP_COMPILER=%rocmllvm_bindir/clang++ \
     -DAMDGPU_TARGETS=%{rocm_gpu_list_default}
 %endif
 
+%endif
+
 %cmake_build
 
 %global gomodulesmode GO111MODULE=on
@@ -162,6 +207,8 @@ export GO_LDFLAGS="-X=github.com/ollama/ollama/version.Version=%{version} -X=git
 
 %install
 
+%if %{without next}
+
 %cmake_install
 
 # remove copies of system libraries
@@ -171,6 +218,8 @@ for rr in $runtime_removal; do
 done
 rm -rf %{buildroot}%{_prefix}/lib/ollama/rocblas
 
+%endif
+
 mkdir -p %{buildroot}%{_bindir}
 install -m 0755 -vp %{gobuilddir}/bin/ollama %{buildroot}%{_bindir}
 
@@ -187,6 +236,14 @@ mkdir -p %{buildroot}%{_var}/lib/ollama
 install -m 0755 -vd                     %{buildroot}%{_bindir}
 install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
+%if %{with next}
+# symlink system llama-server
+mkdir -p %{buildroot}%{_prefix}/lib/ollama
+pushd %{buildroot}%{_prefix}/lib/ollama
+ln -s ../../bin/llama-server llama-server
+popd
+%endif
+
 %check
 %go_vendor_license_check -c %{S:2}
 %if %{with check}
@@ -204,6 +261,23 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %systemd_postun_with_restart ollama.service
 %endif
 
+%if %{with next}
+%files -f %{go_vendor_license_filelist}
+%doc README.md
+%license vendor/modules.txt
+%doc CONTRIBUTING.md SECURITY.md README.md app-README.md integration-README.md
+%doc llama-README.md
+%{_bindir}/ollama
+%{_prefix}/lib/ollama/llama-server
+
+%if %{with systemd}
+%attr(0755,ollama,ollama) %dir  %{_var}/lib/ollama/
+%{_unitdir}/ollama.service
+%{_sysusersdir}/ollama.conf
+%endif
+
+%else
+
 %files
 %doc README.md
 
@@ -243,6 +317,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %{_prefix}/lib/ollama/libggml-vulkan.so
 %endif
 
+%endif
 
 %changelog
 %autochangelog

diff --git a/sources b/sources
index b34f9b2..991bba6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ollama-0.23.4.tar.gz) = 688cd14191bd45e509b967b8164b884674ec275626da8fd2aec71a0912c621a2bc3a974dcb2c0cb2f4de68b7622ccb5cef5d1a28a721f8016d6e2d8497402b75
-SHA512 (ollama-0.23.4-vendor.tar.bz2) = 11a475bb0f269ac0738c3992f522d2435d31b5bc8297fbb5d58a769717e4eaa5663bde52b3d9c4cc705ba677d43d757a9d2ea25d4bb1cda45517f7c0b714c8b0
+SHA512 (ollama-0.24.0.tar.gz) = 59ae6422d60cd6955a85e5cde62c8568191320110b52286305f228dfb5b9c6c9696141bf83c5d527775d95c07a4404f0989ced1c9116c42ad6ad580d34cf7815
+SHA512 (ollama-0.24.0-vendor.tar.bz2) = 8dfb7a82f62bc8991918ad64dd97aafe434949f74c07f3ea6040b982dfbf8a0d72d1e36e72c67221fcbc586670c4139e8a03d27012ca39b57d309034f8efc318