[rpms/ollama] rawhide: Update to 0.33.1

[Tom Rix <Tom.Rix@amd.com>]

            A new commit has been pushed.

            Repo   : rpms/ollama
            Branch : rawhide
            Commit : 38cfcdfd2f854ae43a2e3a568c2fa24aaf4a3817
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-09-01T07:33:21-07:00
            Stats  : +184/-165 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/ollama/c/38cfcdfd2f854ae43a2e3a568c2fa24aaf4a3817?branch=rawhide

            Log:
            Update to 0.33.1

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

---
diff --git a/.gitignore b/.gitignore
index af78b35..851f974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
 /ollama-0.24.0-vendor.tar.bz2
 /ollama-0.32.8.tar.gz
 /ollama-0.32.8-vendor.tar.bz2
+/ollama-0.33.1.tar.gz
+/ollama-0.33.1-vendor.tar.bz2

diff --git a/0001-ollama-download-env-variables.patch b/0001-ollama-download-env-variables.patch
new file mode 100644
index 0000000..508884d
--- /dev/null
+++ b/0001-ollama-download-env-variables.patch
@@ -0,0 +1,148 @@
+From 5807cfe82beeef772269a9655e26a884ea840878 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Sat, 29 Aug 2026 08:32:37 -0700
+Subject: [PATCH] ollama download env variables
+
+---
+ server/download.go | 61 +++++++++++++++++++++++++++++++++++++++++-----
+ server/upload.go   | 26 ++++++++++++++++++--
+ 2 files changed, 79 insertions(+), 8 deletions(-)
+
+diff --git a/server/download.go b/server/download.go
+index bb2de7d24dc5..cb807e5db8fa 100644
+--- a/server/download.go
++++ b/server/download.go
+@@ -36,6 +36,59 @@ var (
+ 	errMaxRedirectsExceeded = errors.New("maximum redirects exceeded (10) for directURL")
+ )
+ 
++var (
++	numDownloadParts          = 16
++	minDownloadPartSize int64 = 100 * format.MegaByte
++	maxDownloadPartSize int64 = 1000 * format.MegaByte
++)
++
++func init() {
++	loadDownloadConfig()
++}
++
++func loadDownloadConfig() {
++	if v := os.Getenv("OLLAMA_NUM_DOWNLOAD_PARTS"); v != "" {
++		if n, err := strconv.Atoi(v); err == nil && n > 0 {
++			numDownloadParts = n
++		}
++	}
++	if v := os.Getenv("OLLAMA_MIN_DOWNLOAD_PART_SIZE"); v != "" {
++		if size, err := parseHumanByte(v); err == nil {
++			minDownloadPartSize = size
++		}
++	}
++	if v := os.Getenv("OLLAMA_MAX_DOWNLOAD_PART_SIZE"); v != "" {
++		if size, err := parseHumanByte(v); err == nil {
++			maxDownloadPartSize = size
++		}
++	}
++}
++
++func parseHumanByte(s string) (int64, error) {
++	s = strings.ToUpper(s)
++	suffixes := map[string]float64{
++		"TB": 1024 * 1024 * 1024 * 1024,
++		"GB": 1024 * 1024 * 1024,
++		"MB": 1024 * 1024,
++		"KB": 1024,
++	}
++	for suffix, multiplier := range suffixes {
++		if strings.HasSuffix(s, suffix) {
++			valStr := strings.TrimSuffix(s, suffix)
++			val, err := strconv.ParseFloat(valStr, 64)
++			if err != nil {
++				return 0, err
++			}
++			return int64(val * float64(multiplier)), nil
++		}
++	}
++	val, err := strconv.ParseInt(s, 10, 64)
++	if err == nil {
++		return val, nil
++	}
++	return 0, fmt.Errorf("cannot parse %s", s)
++}
++
+ var blobDownloadManager sync.Map
+ 
+ type blobDownload struct {
+@@ -96,11 +149,7 @@ func (p *blobDownloadPart) UnmarshalJSON(b []byte) error {
+ 	return nil
+ }
+ 
+-const (
+-	numDownloadParts          = 16
+-	minDownloadPartSize int64 = 100 * format.MegaByte
+-	maxDownloadPartSize int64 = 1000 * format.MegaByte
+-)
++
+ 
+ var downloadStallTimeout = 30 * time.Second
+ 
+@@ -155,7 +204,7 @@ func (b *blobDownload) Prepare(ctx context.Context, requestURL *url.URL, opts *r
+ 
+ 		b.Total, _ = strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+ 
+-		size := b.Total / numDownloadParts
++		size := b.Total / int64(numDownloadParts)
+ 		switch {
+ 		case size < minDownloadPartSize:
+ 			size = minDownloadPartSize
+diff --git a/server/upload.go b/server/upload.go
+index 35a32c6797ed..f416f6aa1f31 100644
+--- a/server/upload.go
++++ b/server/upload.go
+@@ -46,12 +46,34 @@ type blobUpload struct {
+ 	references atomic.Int32
+ }
+ 
+-const (
++var (
+ 	numUploadParts          = 16
+ 	minUploadPartSize int64 = 100 * format.MegaByte
+ 	maxUploadPartSize int64 = 1000 * format.MegaByte
+ )
+ 
++func init() {
++	loadUploadConfig()
++}
++
++func loadUploadConfig() {
++	if v := os.Getenv("OLLAMA_NUM_UPLOAD_PARTS"); v != "" {
++		if n, err := strconv.Atoi(v); err == nil && n > 0 {
++			numUploadParts = n
++		}
++	}
++	if v := os.Getenv("OLLAMA_MIN_UPLOAD_PART_SIZE"); v != "" {
++		if size, err := parseHumanByte(v); err == nil {
++			minUploadPartSize = size
++		}
++	}
++	if v := os.Getenv("OLLAMA_MAX_UPLOAD_PART_SIZE"); v != "" {
++		if size, err := parseHumanByte(v); err == nil {
++			maxUploadPartSize = size
++		}
++	}
++}
++
+ func (b *blobUpload) Prepare(ctx context.Context, requestURL *url.URL, opts *registryOptions) error {
+ 	p, err := manifest.BlobsPath(b.Digest)
+ 	if err != nil {
+@@ -91,7 +113,7 @@ func (b *blobUpload) Prepare(ctx context.Context, requestURL *url.URL, opts *reg
+ 		return nil
+ 	}
+ 
+-	size := b.Total / numUploadParts
++	size := b.Total / int64(numUploadParts)
+ 	switch {
+ 	case size < minUploadPartSize:
+ 		size = minUploadPartSize
+-- 
+2.55.0
+

diff --git a/0001-ollama-use-system-llama.cpp.patch b/0001-ollama-use-system-llama.cpp.patch
new file mode 100644
index 0000000..a062c33
--- /dev/null
+++ b/0001-ollama-use-system-llama.cpp.patch
@@ -0,0 +1,27 @@
+From 35cfe7e4e259e3094b72aef2f18dc24f00e486be Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Sat, 29 Aug 2026 09:25:39 -0700
+Subject: [PATCH] ollama use system llama.cpp
+
+---
+ CMakeLists.txt | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0607f09953d7..2de198a7ae06 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,9 +62,4 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY         ${OLLAMA_BUILD_DIR})
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG   ${OLLAMA_BUILD_DIR})
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OLLAMA_BUILD_DIR})
+ 
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/llama/server/CMakeLists.txt")
+-    set(OLLAMA_HAVE_LLAMA_SERVER TRUE)
+-else()
+-    set(OLLAMA_HAVE_LLAMA_SERVER FALSE)
+-endif()
+-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/local.cmake)
++set(OLLAMA_HAVE_LLAMA_SERVER TRUE)
+-- 
+2.55.0
+

diff --git a/ollama.spec b/ollama.spec
index e027270..eb45144 100644
--- a/ollama.spec
+++ b/ollama.spec
@@ -1,18 +1,12 @@
 # Generated by go2rpm 1.18.0
 # go2rpm -p vendor -v 0.12.11 --name ollama github.com/ollama/ollama
 %bcond check 0
-%ifarch x86_64
-%bcond rocm 1
-%else
-%bcond rocm 0
-%endif
-%bcond vulkan 1
 
 # bundled GGML sources are missing ppc64le and s390x
 ExcludeArch:    ppc64le s390x
 
 # Build the next version of ollama
-%bcond next 1
+%bcond next 0
 
 # systemd testing
 %bcond systemd 1
@@ -22,7 +16,7 @@ ExcludeArch:    ppc64le s390x
 %if %{with next}
 Version:                0.32.8
 %else
-Version:                0.24.0
+Version:                0.33.1
 %endif
 
 %gometa -L -f
@@ -43,45 +37,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
-Patch2:         0001-feat-server-make-download-and-upload-parameters-conf.patch
-%endif
+Patch1:         0001-ollama-download-env-variables.patch
+Patch2:         0001-ollama-use-system-llama.cpp.patch
 
 BuildRequires:  go-vendor-tools
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-%if %{with next}
 BuildRequires:  llama-cpp-devel
-%else
-
-%if %{with rocm}
-BuildRequires:  hipblas-devel
-BuildRequires:  rocblas-devel
-BuildRequires:  rocm-comgr-devel
-BuildRequires:  rocm-compilersupport-macros
-BuildRequires:  rocm-runtime-devel
-BuildRequires:  rocm-hip-devel
-BuildRequires:  rocm-rpm-macros
-BuildRequires:  rocminfo
-%endif
-
-%if %{with vulkan}
-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
@@ -91,51 +59,9 @@ Obsoletes:       ollama-vulkan < 0.30.0
 %{?systemd_requires}
 %endif
 
-%else
-
-Requires:       %{name}-base%{?_isa} = %{version}-%{release}
-%if %{with rocm}
-Requires:       %{name}-rocm%{?_isa} = %{version}-%{release}
-%endif
-%if %{with vulkan}
-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}
-%{?systemd_requires}
-%endif
-
-%description base
-%{summary}
-
-%if %{with rocm}
-%package rocm
-Summary:        The ROCm backend for ollama
-Requires:       hipblas
-Requires:       rocblas
-
-%description rocm
-%{summary}
-%endif
-
-%if %{with vulkan}
-%package vulkan
-Summary:        The Vulkan backend for ollama
-
-%description vulkan
-%{summary}
-%endif
-
-%endif
-
 %prep
 %goprep -A
 %setup -q -T -D -a1 %{forgesetupargs}
@@ -146,13 +72,6 @@ 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
 # disable
@@ -166,33 +85,16 @@ 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 
 
 %cmake_build
-
 %global gomodulesmode GO111MODULE=on
 
 # Debug with:
@@ -207,20 +109,6 @@ export GO_LDFLAGS="-X=github.com/ollama/ollama/version.Version=%{version} -X=git
 %gobuild -o %{gobuilddir}/bin/ollama %{goipath}
 
 %install
-
-%if %{without next}
-
-%cmake_install
-
-# remove copies of system libraries
-runtime_removal="hipblas rocblas amdhip64 rocsolver amd_comgr hsa-runtime64 rocsparse tinfo rocprofiler-register drm drm_amdgpu numa elf vulkan"
-for rr in $runtime_removal; do
-    rm -rf %{buildroot}%{_prefix}/lib/ollama/lib${rr}*
-done
-rm -rf %{buildroot}%{_prefix}/lib/ollama/rocblas
-
-%endif
-
 mkdir -p %{buildroot}%{_bindir}
 install -m 0755 -vp %{gobuilddir}/bin/ollama %{buildroot}%{_bindir}
 
@@ -237,13 +125,11 @@ 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}
@@ -262,7 +148,6 @@ popd
 %systemd_postun_with_restart ollama.service
 %endif
 
-%if %{with next}
 %files -f %{go_vendor_license_filelist}
 %doc README.md
 %license vendor/modules.txt
@@ -277,48 +162,5 @@ popd
 %{_sysusersdir}/ollama.conf
 %endif
 
-%else
-
-%files
-%doc README.md
-
-%files -f %{go_vendor_license_filelist} base
-%license vendor/modules.txt
-%doc CONTRIBUTING.md SECURITY.md README.md app-README.md integration-README.md
-%doc llama-README.md
-%{_prefix}/lib/ollama/libggml-base.so
-%{_prefix}/lib/ollama/libggml-base.so.0{,.*}
-%ifarch x86_64
-%{_prefix}/lib/ollama/libggml-cpu-alderlake.so
-%{_prefix}/lib/ollama/libggml-cpu-haswell.so
-%{_prefix}/lib/ollama/libggml-cpu-icelake.so
-%{_prefix}/lib/ollama/libggml-cpu-sandybridge.so
-%{_prefix}/lib/ollama/libggml-cpu-skylakex.so
-%{_prefix}/lib/ollama/libggml-cpu-sse42.so
-%{_prefix}/lib/ollama/libggml-cpu-x64.so
-%else
-# upstream CMakeLists.txt disables GGML CPU variants on aarch64
-%{_prefix}/lib/ollama/libggml-cpu.so
-%endif
-%{_bindir}/ollama
-
-%if %{with systemd}
-%attr(0755,ollama,ollama) %dir  %{_var}/lib/ollama/
-%{_unitdir}/ollama.service
-%{_sysusersdir}/ollama.conf
-%endif
-
-%if %{with rocm}
-%files rocm
-%{_prefix}/lib/ollama/libggml-hip.so
-%endif
-
-%if %{with vulkan}
-%files vulkan
-%{_prefix}/lib/ollama/libggml-vulkan.so
-%endif
-
-%endif
-
 %changelog
 %autochangelog

diff --git a/sources b/sources
index 0adc60b..44ba025 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ollama-0.32.8.tar.gz) = 5b72d091c3d680afce87b06677e18c6bc0a807a84d7803b408bd801dbd538079ff07823b30c8ac32572b21d09858ee45d1105dfa19271fd67de355c4a80859c8
-SHA512 (ollama-0.32.8-vendor.tar.bz2) = 6f4ff2370e49522a1e0048a52882781683ac024c999a7d03607496a24486c1c0e32284df79c394b19780602500ab2c02da383330289053bb23ce53598de82a4a
+SHA512 (ollama-0.33.1.tar.gz) = ce353a7c51f4d94a072bee1894e8bb7044822e2ac43707df677654bf89b6d43b117ccd59010648e18354504d3a77970e7573e720906fcaa4528ca116d37ede32
+SHA512 (ollama-0.33.1-vendor.tar.bz2) = de04ff7b6375da58fc09f04e4a07749229a7663e4cf70f2a5280e9346fd0e8e88f3be822c9f3175ae95a7b5cba940f07211dda690b91d6fcdfdf472d9ca44837