From cf9cf2a4df8db56b0994166360025b1258acccb99083f10a76f4cde60938dfb9 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Mon, 13 May 2024 03:27:47 +0000
Subject: [PATCH] Accepting request 1173521 from
 home:VaiTon:branches:science:machinelearning

- Update to version 0.1.37:
  * Fixed issue where models with uppercase characters in the name
    would not show with ollama list
  * Fixed usage string for ollama create
  * Fix finish_reason being "" instead of null in the Open-AI
    compatible chat API.

- Use obs_scm service instead of the deprecated tar_scm
- Use zstd for vendor tarball compression

OBS-URL: https://build.opensuse.org/request/show/1173521
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ollama?expand=0&rev=13
---
 .gitattributes        |  2 ++
 _service              | 19 ++++++++++---------
 _servicedata          |  2 +-
 ollama-0.1.36.tar.gz  |  3 ---
 ollama-0.1.37.obscpio |  3 +++
 ollama.changes        | 16 ++++++++++++++++
 ollama.obsinfo        |  4 ++++
 ollama.spec           |  7 ++++---
 vendor.tar.xz         |  3 ---
 vendor.tar.zstd       |  3 +++
 10 files changed, 43 insertions(+), 19 deletions(-)
 delete mode 100644 ollama-0.1.36.tar.gz
 create mode 100644 ollama-0.1.37.obscpio
 create mode 100644 ollama.obsinfo
 delete mode 100644 vendor.tar.xz
 create mode 100644 vendor.tar.zstd

diff --git a/.gitattributes b/.gitattributes
index 9b03811..1076d31 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+vendor.tar.zstd filter=lfs diff=lfs merge=lfs -text
diff --git a/_service b/_service
index f6e654f..59dbc70 100644
--- a/_service
+++ b/_service
@@ -1,22 +1,23 @@
 <services>
-  <service name="format_spec_file" mode="manual">
-  </service>
-  <service name="tar_scm" mode="manual">
+  <service name="format_spec_file" mode="manual" />
+  <service name="obs_scm" mode="manual">
     <param name="url">https://github.com/ollama/ollama.git</param>
     <param name="scm">git</param>
-    <param name="revision">v0.1.36</param>
+    <param name="revision">v0.1.37</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
     <param name="submodules">enable</param>
+    <param name="exclude">macapp</param>
     <param name="package-meta">yes</param>
   </service>
-  <service name="recompress" mode="manual">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
   <service name="go_modules" mode="manual">
-    <param name="compression">xz</param>
+    <param name="compression">zstd</param>
   </service>
   <service name="set_version" mode="manual" />
+
+  <service name="tar" mode="buildtime">
+    <param name="package-meta">yes</param>
+  </service>
+  
 </services>
diff --git a/_servicedata b/_servicedata
index 73f1d34..4c27cfe 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/ollama/ollama.git</param>
-              <param name="changesrevision">92ca2cca954e590abe5eecb0a87fa13cec83b0e1</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">41ba3017fd74dfce9a3dc00160f29befec85a41b</param></service></servicedata>
\ No newline at end of file
diff --git a/ollama-0.1.36.tar.gz b/ollama-0.1.36.tar.gz
deleted file mode 100644
index baa3564..0000000
--- a/ollama-0.1.36.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:285ea18c73f9d8cbebd19ed429fb691a84853fa06366a6d206e74a9a5cfd2243
-size 87336304
diff --git a/ollama-0.1.37.obscpio b/ollama-0.1.37.obscpio
new file mode 100644
index 0000000..2faa92e
--- /dev/null
+++ b/ollama-0.1.37.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6825400dbf9a926fb6d8ea4c03fc61f981ec03f0897ffc65f74fc3a733b562cf
+size 130026510
diff --git a/ollama.changes b/ollama.changes
index 014fd4c..0045e4e 100644
--- a/ollama.changes
+++ b/ollama.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun May 12 19:05:53 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
+
+- Update to version 0.1.37:
+  * Fixed issue where models with uppercase characters in the name
+    would not show with ollama list
+  * Fixed usage string for ollama create
+  * Fix finish_reason being "" instead of null in the Open-AI
+    compatible chat API.
+
+-------------------------------------------------------------------
+Sun May 12 15:20:28 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
+
+- Use obs_scm service instead of the deprecated tar_scm
+- Use zstd for vendor tarball compression 
+
 -------------------------------------------------------------------
 Sun May 12 01:39:26 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
 
diff --git a/ollama.obsinfo b/ollama.obsinfo
new file mode 100644
index 0000000..1a12e82
--- /dev/null
+++ b/ollama.obsinfo
@@ -0,0 +1,4 @@
+name: ollama
+version: 0.1.37
+mtime: 1715466701
+commit: 41ba3017fd74dfce9a3dc00160f29befec85a41b
diff --git a/ollama.spec b/ollama.spec
index b01357a..725965d 100644
--- a/ollama.spec
+++ b/ollama.spec
@@ -17,13 +17,13 @@
 
 
 Name:           ollama
-Version:        0.1.36
+Version:        0.1.37
 Release:        0
 Summary:        Tool for running AI models on-premise
 License:        MIT
 URL:            https://ollama.com
-Source:         %{name}-%{version}.tar.gz
-Source1:        vendor.tar.xz
+Source:         %{name}-%{version}.tar
+Source1:        vendor.tar.zstd
 Source2:        ollama.service
 Source3:        %{name}-user.conf
 Patch0:         enable-lto.patch
@@ -31,6 +31,7 @@ BuildRequires:  cmake >= 3.24
 BuildRequires:  gcc-c++ >= 11.4.0
 BuildRequires:  git
 BuildRequires:  sysuser-tools
+BuildRequires:  zstd
 BuildRequires:  golang(API) >= 1.22
 
 %{sysusers_requires}
diff --git a/vendor.tar.xz b/vendor.tar.xz
deleted file mode 100644
index 8226d89..0000000
--- a/vendor.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21390f2f5bbd12b7a6c134b3ced1bafe76b929f85077e273d6c8f378cb156eb2
-size 4310640
diff --git a/vendor.tar.zstd b/vendor.tar.zstd
new file mode 100644
index 0000000..47f6364
--- /dev/null
+++ b/vendor.tar.zstd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:202da226a0bad5afdb4afb42c75da9a04277e4c3a5be9bce390a049c025bd7af
+size 5330325