From 5f3ac1eeb997ffffd5718e8b6985bc403bebc2279ce655394882eecf5299b42d Mon Sep 17 00:00:00 2001
From: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
Date: Thu, 16 May 2024 15:18:42 +0000
Subject: [PATCH] - More cleanup

OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=181
---
 julia.changes |  5 ++++
 julia.spec    | 63 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/julia.changes b/julia.changes
index 6350e2e..9e53acd 100644
--- a/julia.changes
+++ b/julia.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 16 15:18:08 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
+
+- More cleanup
+
 -------------------------------------------------------------------
 Wed May 15 12:33:37 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
 
diff --git a/julia.spec b/julia.spec
index f54573a..50375ac 100644
--- a/julia.spec
+++ b/julia.spec
@@ -332,11 +332,6 @@ ln -sf %{_libdir}/libgcc_s.so.1 %{_builddir}/%{buildsubdir}/build/%{_libdir}/lib
 # Idk how it can't find libblastrampoline?
 ln -sf %{_libdir}/libblastrampoline.so %{_builddir}/%{buildsubdir}/build/%{_libdir}/libblastrampoline.so
 
-# Doing this here because it's weird that it builds if done like this.
-export USE_BLAS64=1
-export USE_BINARYBUILDER_OPENBLAS=0
-# Suffix is 64_ (with underscore) if 64-bit because OpenBlas_jll seems to use that suffix
-
 export LD_LIBRARY_PATH="%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir}:/usr/lib64:/usr/lib"
 make MARCH=%{julia_march} prefix=%{_prefix} libdir=%{_libdir} bindir=%{_bindir} build_prefix="%{_builddir}/%{buildsubdir}/build%{_prefix}" build_libdir="%{_builddir}/%{buildsubdir}/build%{_libdir}"   -C deps install-pcre            %{__julia_opts}
 make MARCH=%{julia_march} prefix=%{_prefix} libdir=%{_libdir} bindir=%{_bindir} build_prefix="%{_builddir}/%{buildsubdir}/build%{_prefix}" build_libdir="%{_builddir}/%{buildsubdir}/build%{_libdir}"   -C deps install-openblas        %{__julia_opts}
@@ -355,25 +350,31 @@ make MARCH=%{julia_march} prefix=%{_prefix} libdir=%{_libdir} bindir=%{_bindir}
 # https://github.com/JuliaLang/julia/pull/42524/files#r734972945
 sed "s/ \$(build_prefix)\\/manifest\\/zlib//" -i deps/llvm.mk
 
+%if 0%{?suse_version} > 1600
+RELEASE_BANNER="openSUSE Tumbleweed - Built on $(date -u)"
+%else
+SLE_VERSION="$(echo %{sle_version} | sed -E 's|^(15)0([0-9])00|\1.\2|m')"
+RELEASE_BANNER="openSUSE Leap ${SLE_VERSION} - Built on $(date -u)"
+%endif
 make %{?_smp_mflags} \
-                     MARCH=%{julia_march} \
+                     MARCH="%{julia_march}" \
 %ifarch x86_64 || x86_64_v3
                      JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" \
 %endif
                      build_prefix="%{_builddir}/%{buildsubdir}/build%{_prefix}" \
                      build_libdir="%{_builddir}/%{buildsubdir}/build%{_libdir}" \
-                     prefix=%{_prefix} \
-                     bindir=%{_bindir} \
-                     libdir=%{_libdir} \
-                     libexecdir=%{_libexecdir} \
-                     datarootdir=%{_datarootdir} \
-                     includedir=%{_includedir} \
-                     sysconfdir=%{_sysconfdir} \
+                     prefix="%{_prefix}" \
+                     bindir="%{_bindir}" \
+                     libdir="%{_libdir}" \
+                     libexecdir="%{_libexecdir}" \
+                     datarootdir="%{_datarootdir}" \
+                     includedir="%{_includedir}" \
+                     sysconfdir="%{_sysconfdir}" \
                      %{__julia_opts} \
 %if 0%{?suse_version} > 1600
-                     TAGGED_RELEASE_BANNER="openSUSE Tumbleweed Build" \
+                     TAGGED_RELEASE_BANNER="${RELEASE_BANNER}" \
 %else
-                     TAGGED_RELEASE_BANNER="openSUSE Leap $(echo \"%{?sle_version}\" | tr '0' '.' | sed 's/..$//') Build" \
+                     TAGGED_RELEASE_BANNER="${RELEASE_BANNER}" \
 %endif
                      release
 
@@ -408,25 +409,31 @@ export DEPS_GIT=0
 export BUILD_LLD=1
 export BUILD_LLDB=1
 export LD_LIBRARY_PATH="%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir}:/usr/lib64:/usr/lib"
-make install DESTDIR=%{buildroot} \
-             MARCH=%{julia_march} \
+%if 0%{?suse_version} > 1600
+RELEASE_BANNER="openSUSE Tumbleweed - Built on $(date -u)"
+%else
+SLE_VERSION="$(echo %{sle_version} | sed -E 's|^(15)0([0-9])00|\1.\2|m')"
+RELEASE_BANNER="openSUSE Leap ${SLE_VERSION} - Built on $(date -u)"
+%endif
+make install DESTDIR="%{buildroot}" \
+             MARCH="%{julia_march}" \
 %ifarch x86_64 || x86_64_v3
              JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" \
 %endif
-             build_prefix=%{_builddir}/%{buildsubdir}/build%{_prefix} \
-             build_libdir=%{_builddir}/%{buildsubdir}/build%{_libdir} \
-             prefix=%{_prefix} \
-             bindir=%{_bindir} \
-             libdir=%{_libdir} \
-             libexecdir=%{_libexecdir} \
-             datarootdir=%{_datarootdir} \
-             includedir=%{_includedir} \
-             sysconfdir=%{_sysconfdir} \
+             build_prefix="%{_builddir}/%{buildsubdir}/build%{_prefix}" \
+             build_libdir="%{_builddir}/%{buildsubdir}/build%{_libdir}" \
+             prefix="%{_prefix}" \
+             bindir="%{_bindir}" \
+             libdir="%{_libdir}" \
+             libexecdir="%{_libexecdir}" \
+             datarootdir="%{_datarootdir}" \
+             includedir="%{_includedir}" \
+             sysconfdir="%{_sysconfdir}" \
              %{__julia_opts} \
 %if 0%{?suse_version} > 1600
-             TAGGED_RELEASE_BANNER="openSUSE Tumbleweed Build"
+             TAGGED_RELEASE_BANNER="${RELEASE_BANNER}"
 %else
-             TAGGED_RELEASE_BANNER="openSUSE Leap $(echo \"%{?sle_version}\" | tr '0' '.' | sed 's/..$//') Build"
+             TAGGED_RELEASE_BANNER="${RELEASE_BANNER}"
 %endif
 
 # GZip man page.