Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ollama for openSUSE:Factory checked
in at 2025-05-26 18:32:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ollama (Old)
and /work/SRC/openSUSE:Factory/.ollama.new.2732 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ollama"
Mon May 26 18:32:37 2025 rev:37 rq:1279778 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ollama/ollama.changes 2025-05-20
09:38:54.415497274 +0200
+++ /work/SRC/openSUSE:Factory/.ollama.new.2732/ollama.changes 2025-05-26
18:33:53.319263270 +0200
@@ -1,0 +2,13 @@
+Fri May 23 11:48:24 UTC 2025 - Wolfgang Engel <wolfgang.en...@suse.com>
+
+- Cleanup part in spec file where build for SLE-15-SP6 and above
+ is defined to make if condition more robust
+
+-------------------------------------------------------------------
+Wed May 21 18:42:55 UTC 2025 - Wolfgang Engel <wolfgang.en...@suse.com>
+
+- Allow to build for Package Hub for SLE-15-SP7
+ (openSUSE:Backports:SLE-15-SP7) with g++-12/gcc-12
+ by checking for sle_version >= 150600 in spec file (bsc#1243438)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ollama.spec ++++++
--- /var/tmp/diff_new_pack.bpvmlx/_old 2025-05-26 18:33:54.079295136 +0200
+++ /var/tmp/diff_new_pack.bpvmlx/_new 2025-05-26 18:33:54.083295304 +0200
@@ -16,6 +16,10 @@
#
+%if 0%{?sle_version} && 0%{?sle_version} >= 150600
+%global force_gcc_version 12
+%endif
+
Name: ollama
Version: 0.7.0
Release: 0
@@ -37,11 +41,12 @@
# 32bit seems not to be supported anymore
ExcludeArch: %{ix86} %{arm}
%sysusers_requires
-%if 0%{?sle_version} == 150600
-BuildRequires: gcc12-c++
-BuildRequires: libstdc++6-gcc12
+%if 0%{?force_gcc_version}
+BuildRequires: gcc%{?force_gcc_version}-c++
+BuildRequires: libstdc++6-gcc%{?force_gcc_version}
%else
BuildRequires: gcc-c++ >= 11.4.0
+BuildRequires: libstdc++6
%endif
%description
@@ -63,9 +68,9 @@
%ifnarch ppc64
export GOFLAGS="-buildmode=pie -mod=vendor"
%endif
-%if 0%{?sle_version} == 150600
-export CXX=g++-12
-export CC=gcc-12
+%if 0%{?force_gcc_version}
+export CXX="g++-%{?force_gcc_version}"
+export CC="gcc-%{?force_gcc_version}"
# pie doesn't work with gcc12 on leap
export GOFLAGS="-mod=vendor"
%endif
@@ -91,9 +96,9 @@
cp -Ra docs/* "%{buildroot}/%{_docdir}/%{name}"
%check
-%if 0%{?sle_version} == 150600
-export CXX=g++-12
-export CC=gcc-12
+%if 0%{?force_gcc_version}
+export CXX="g++-%{?force_gcc_version}"
+export CC="gcc-%{?force_gcc_version}"
# pie doesn't work with gcc12 on leap
export GOFLAGS="-mod=vendor"
%endif
