From 03cc889a48ceac6442f806ea791791a1c79b1306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Fri, 7 May 2021 18:41:16 +0200
Subject: [PATCH] Update to 0.3.15. - related: #1870676 - related: #1870033

---
 .gitignore                   |  1 +
 openblas-0.2.5-libname.patch |  4 +--
 openblas-0.3.11-tests.patch  | 50 +++++++++++++++++++-----------------
 openblas.spec                | 11 +++++---
 sources                      |  2 +-
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a998e1..70a6db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /openblas-0.3.11.tar.gz
 /openblas-0.3.12.tar.gz
 /openblas-0.3.13.tar.gz
+/openblas-0.3.15.tar.gz
diff --git a/openblas-0.2.5-libname.patch b/openblas-0.2.5-libname.patch
index 8ba1080..f59d61e 100644
--- a/openblas-0.2.5-libname.patch
+++ b/openblas-0.2.5-libname.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile.system b/Makefile.system
-index 5adde36d..de1c9e8c 100644
+index ae703e4d..80739dc4 100644
 --- a/Makefile.system
 +++ b/Makefile.system
-@@ -1465,16 +1465,16 @@ ifndef SMP
+@@ -1515,16 +1515,16 @@ ifndef SMP
  LIBNAME		= $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
  LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
  else
diff --git a/openblas-0.3.11-tests.patch b/openblas-0.3.11-tests.patch
index b271c28..2c49d09 100644
--- a/openblas-0.3.11-tests.patch
+++ b/openblas-0.3.11-tests.patch
@@ -1,6 +1,29 @@
-diff -up OpenBLAS-0.3.11/cpp_thread_test/Makefile.tests OpenBLAS-0.3.11/cpp_thread_test/Makefile
---- OpenBLAS-0.3.11/cpp_thread_test/Makefile.tests	2020-10-17 22:14:12.000000000 +0200
-+++ OpenBLAS-0.3.11/cpp_thread_test/Makefile	2020-10-18 18:18:59.460796184 +0200
+diff --git a/Makefile b/Makefile
+index 555d1c46..7dc74273 100644
+--- a/Makefile
++++ b/Makefile
+@@ -144,13 +144,13 @@ tests :
+ ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+ 	touch $(LIBNAME)
+ ifndef NO_FBLAS
+-	$(MAKE) -C test all
++	$(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
+ endif
+-	$(MAKE) -C utest all
++	$(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
+ ifneq ($(NO_CBLAS), 1)
+-	$(MAKE) -C ctest all
++	$(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
+ ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
+-	$(MAKE) -C cpp_thread_test all
++	$(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
+ endif
+ endif
+ endif
+diff --git a/cpp_thread_test/Makefile b/cpp_thread_test/Makefile
+index 81e3470e..d541b70d 100644
+--- a/cpp_thread_test/Makefile
++++ b/cpp_thread_test/Makefile
 @@ -1,13 +1,14 @@
 -include ../Makefile.rule
 +TOPDIR = ..
@@ -19,24 +42,3 @@ diff -up OpenBLAS-0.3.11/cpp_thread_test/Makefile.tests OpenBLAS-0.3.11/cpp_thre
  	./dgemm_tester
  
  clean ::
-diff -up OpenBLAS-0.3.11/Makefile.tests OpenBLAS-0.3.11/Makefile
---- OpenBLAS-0.3.11/Makefile.tests	2020-10-17 22:14:12.000000000 +0200
-+++ OpenBLAS-0.3.11/Makefile	2020-10-18 18:19:54.134437445 +0200
-@@ -138,13 +138,13 @@ tests :
- ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
- 	touch $(LIBNAME)
- ifndef NO_FBLAS
--	$(MAKE) -C test all
-+	$(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
- endif
--	$(MAKE) -C utest all
-+	$(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
- ifneq ($(NO_CBLAS), 1)
--	$(MAKE) -C ctest all
-+	$(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
- ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
--	$(MAKE) -C cpp_thread_test all
-+	$(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
- endif
- endif
- endif
diff --git a/openblas.spec b/openblas.spec
index 522f73c..072ad33 100644
--- a/openblas.spec
+++ b/openblas.spec
@@ -1,6 +1,6 @@
 %bcond_with system_lapack
 # Version of bundled lapack
-%global lapackver 3.9.0
+%global lapackver 3.9.1
 
 # DO NOT "CLEAN UP" OR MODIFY THIS SPEC FILE WITHOUT ASKING THE
 # MAINTAINER FIRST!
@@ -14,8 +14,8 @@
 # "obsoleted" features are still kept in the spec.
 
 Name:           openblas
-Version:        0.3.13
-Release:        2%{?dist}
+Version:        0.3.15
+Release:        1%{?dist}
 Summary:        An optimized BLAS library based on GotoBLAS2
 License:        BSD
 URL:            https://github.com/xianyi/OpenBLAS/
@@ -646,6 +646,11 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
 %endif
 
 %changelog
+* Thu May 06 2021 Nikola Forró <nforro@redhat.com> - 0.3.15-1
+- Update to 0.3.15.
+  related: #1870676
+  related: #1870033
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.13-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/sources b/sources
index d1c640d..8b8bf9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openblas-0.3.13.tar.gz) = 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
+SHA512 (openblas-0.3.15.tar.gz) = c07964ead5ffe9cf088364697bfe5cb409170663e420bdcd08a6366a028625d2a3c23ee4ddbaf0e625860a9fd08cbbb39f97eb985c366c052696d6f8598a844f