public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom Rix <Tom.Rix@amd.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ollama] rawhide: Update to 0.32.8
Date: Tue, 18 Aug 2026 21:57:46 GMT	[thread overview]
Message-ID: <178709026651.1.12046820629493555247.rpms-ollama-031c0659c147@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/ollama
            Branch : rawhide
            Commit : 031c0659c147e0eac44c5c470875602fdd833bd8
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-08-18T14:57:16-07:00
            Stats  : +70/-9 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/ollama/c/031c0659c147e0eac44c5c470875602fdd833bd8?branch=rawhide

            Log:
            Update to 0.32.8

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

---
diff --git a/.gitignore b/.gitignore
index 61af656..af78b35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 /ollama-0.23.4-vendor.tar.bz2
 /ollama-0.24.0.tar.gz
 /ollama-0.24.0-vendor.tar.bz2
+/ollama-0.32.8.tar.gz
+/ollama-0.32.8-vendor.tar.bz2

diff --git a/0001-ollama-OLLAMA_USE_SYSTEM_LLAMA_CPP.patch b/0001-ollama-OLLAMA_USE_SYSTEM_LLAMA_CPP.patch
new file mode 100644
index 0000000..415a088
--- /dev/null
+++ b/0001-ollama-OLLAMA_USE_SYSTEM_LLAMA_CPP.patch
@@ -0,0 +1,59 @@
+From 56aa42f68c715ed100dc9375c89d9e077d99a6e6 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Wed, 24 Jun 2026 09:20:20 -0700
+Subject: [PATCH] ollama OLLAMA_USE_SYSTEM_LLAMA_CPP
+
+---
+ cmake/local.cmake | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/local.cmake b/cmake/local.cmake
+index 116e7526e685..bf1a75b5b242 100644
+--- a/cmake/local.cmake
++++ b/cmake/local.cmake
+@@ -15,6 +15,8 @@ set(OLLAMA_PAYLOAD_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE PATH
+ 
+ string(REGEX REPLACE "^v" "" OLLAMA_VERSION "${OLLAMA_VERSION}")
+ 
++option(OLLAMA_USE_SYSTEM_LLAMA_CPP "Use a system-installed llama.cpp via CMake find_package" OFF)
++
+ set(OLLAMA_NATIVE_CONFIG_ARG)
+ if(CMAKE_CONFIGURATION_TYPES)
+     set(OLLAMA_NATIVE_CONFIG_ARG --config Release)
+@@ -121,6 +123,10 @@ else()
+             "$ENV{OLLAMA_LLAMA_CPP_SOURCE}" ABSOLUTE BASE_DIR "${CMAKE_SOURCE_DIR}")
+         message(STATUS "Using local llama.cpp source: ${OLLAMA_LLAMA_CPP_SOURCE_DIR}")
+         add_custom_target(ollama-llama-cpp-source)
++    elseif(OLLAMA_USE_SYSTEM_LLAMA_CPP)
++        message(STATUS "Attempting to use system-installed llama.cpp...")
++        find_package(llama CONFIG REQUIRED)
++        message(STATUS "Successfully configured system llama.cpp")
+     else()
+         set(OLLAMA_LLAMA_CPP_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/llama_cpp-src")
+         ExternalProject_Add(ollama-llama-cpp-source
+@@ -522,14 +528,20 @@ if(OLLAMA_HAVE_LLAMA_SERVER)
+         endif()
+     endif()
+ 
+-    ollama_add_llama_server_build(local
++    if(OLLAMA_USE_SYSTEM_LLAMA_CPP)
++      add_custom_target(ollama-local ALL
++        DEPENDS ollama-go
++        COMMENT "Building local Ollama payload")
++    else()
++      ollama_add_llama_server_build(local
+         RUNNER_DIR ""
+         TARGETS llama-server llama-quantize
+         CMAKE_ARGS ${_cpu_args})
+ 
+-    add_custom_target(ollama-local ALL
++      add_custom_target(ollama-local ALL
+         DEPENDS ollama-go ollama-llama-server-local
+         COMMENT "Building local Ollama payload")
++    endif()
+ 
+     install(PROGRAMS "${OLLAMA_GO_OUTPUT}"
+         DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-- 
+2.53.0
+

diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml
index cd5cf93..9cc1330 100644
--- a/go-vendor-tools.toml
+++ b/go-vendor-tools.toml
@@ -3,6 +3,11 @@
 [licensing]
 detector = "askalono"
 [[licensing.licenses]]
+path = "vendor/github.com/apache/arrow/go/arrow/LICENSE.txt"
+sha256sum = "b9bb118a7b522be9463470835c0a50451255b4e8dd350465c366a1656128f622"
+expression = "(Apache-2.0 AND BSD-3-Clause) AND BSD-3-Clause AND CC0-1.0 AND (LicenseRef-scancode-public-domain AND MIT) AND Apache-2.0 AND BSL-1.0 AND (BSD-2-Clause AND BSD-3-Clause) AND MIT AND (BSL-1.0 AND BSD-2-Clause) AND BSD-2-Clause AND ZPL-2.1 AND LicenseRef-scancode-protobuf AND NCSA AND (CC-BY-3.0 AND MIT) AND (CC-BY-4.0 AND LicenseRef-scancode-public-domain) AND NTP AND Zlib AND OpenSSL AND (BSD-3-Clause AND BSD-2-Clause) AND (BSD-2-Clause AND Zlib)"
+
+[[licensing.licenses]]
 path = "vendor/gopkg.in/yaml.v3/LICENSE"
 sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b"
 expression = "MIT AND (MIT AND Apache-2.0)"
@@ -13,11 +18,6 @@ sha256sum = "871b440e9b348d6b2485c72e15f1d18f4cf8ee7bb424cbcd854b6a4a772b61d8"
 expression = "BSD-2-Clause AND ISC"
 
 [[licensing.licenses]]
-path = "vendor/github.com/apache/arrow/go/arrow/LICENSE.txt"
-sha256sum = "b9bb118a7b522be9463470835c0a50451255b4e8dd350465c366a1656128f622"
-expression = "(Apache-2.0 AND BSD-3-Clause) AND BSD-3-Clause AND CC0-1.0 AND (LicenseRef-scancode-public-domain AND MIT) AND Apache-2.0 AND BSL-1.0 AND (BSD-2-Clause AND BSD-3-Clause) AND MIT AND (BSL-1.0 AND BSD-2-Clause) AND BSD-2-Clause AND ZPL-2.1 AND LicenseRef-scancode-protobuf AND NCSA AND (CC-BY-3.0 AND MIT) AND (CC-BY-4.0 AND LicenseRef-scancode-public-domain) AND NTP AND Zlib AND OpenSSL AND (BSD-3-Clause AND BSD-2-Clause) AND (BSD-2-Clause AND Zlib)"
-
-[[licensing.licenses]]
 path = "vendor/github.com/mattn/go-localereader/README.md"
 sha256sum = "0c5c52517f13becd7a1e1234f1e8a5ba370f5a5078cee9ac058c2d534e267fcb"
 expression = "MIT"

diff --git a/ollama.spec b/ollama.spec
index 91a4d14..e027270 100644
--- a/ollama.spec
+++ b/ollama.spec
@@ -12,7 +12,7 @@
 ExcludeArch:    ppc64le s390x
 
 # Build the next version of ollama
-%bcond next 0
+%bcond next 1
 
 # systemd testing
 %bcond systemd 1
@@ -20,7 +20,7 @@ ExcludeArch:    ppc64le s390x
 # https://github.com/ollama/ollama
 %global goipath         github.com/ollama/ollama
 %if %{with next}
-Version:                0.30.11
+Version:                0.32.8
 %else
 Version:                0.24.0
 %endif

diff --git a/sources b/sources
index 991bba6..0adc60b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ollama-0.24.0.tar.gz) = 59ae6422d60cd6955a85e5cde62c8568191320110b52286305f228dfb5b9c6c9696141bf83c5d527775d95c07a4404f0989ced1c9116c42ad6ad580d34cf7815
-SHA512 (ollama-0.24.0-vendor.tar.bz2) = 8dfb7a82f62bc8991918ad64dd97aafe434949f74c07f3ea6040b982dfbf8a0d72d1e36e72c67221fcbc586670c4139e8a03d27012ca39b57d309034f8efc318
+SHA512 (ollama-0.32.8.tar.gz) = 5b72d091c3d680afce87b06677e18c6bc0a807a84d7803b408bd801dbd538079ff07823b30c8ac32572b21d09858ee45d1105dfa19271fd67de355c4a80859c8
+SHA512 (ollama-0.32.8-vendor.tar.bz2) = 6f4ff2370e49522a1e0048a52882781683ac024c999a7d03607496a24486c1c0e32284df79c394b19780602500ab2c02da383330289053bb23ce53598de82a4a

                 reply	other threads:[~2026-08-18 21:57 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178709026651.1.12046820629493555247.rpms-ollama-031c0659c147@fedoraproject.org \
    --to=tom.rix@amd.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox