From 17bcd25acfc19783dc57d52118eac12c108c5f0f Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Jan 29 2022 17:02:57 +0000
Subject: Update to release 1.3.8 (rhbz#1996122)


Correct contents of cminpack pkgconfig file (rhbz#1954816)

---

diff --git a/cminpack-1.3.8-blas.patch b/cminpack-1.3.8-blas.patch
index 449ab4a..45b7454 100644
--- a/cminpack-1.3.8-blas.patch
+++ b/cminpack-1.3.8-blas.patch
@@ -1,6 +1,18 @@
+diff -up ./cmake/cminpack.pc.in.blas ./cmake/cminpack.pc.in
+--- ./cmake/cminpack.pc.in.blas	2021-02-10 00:05:42.000000000 -0500
++++ ./cmake/cminpack.pc.in	2022-01-22 22:42:26.992629886 -0500
+@@ -7,6 +7,6 @@ includedir=${prefix}/@CMINPACK_INCLUDE_I
+ Name: CMinPack
+ Description: CMinPack
+ Version: @CMINPACK_VERSION@
+-Requires:
++Requires: @PC_CMINPACK_REQUIRES@
+ Libs: -L${libdir} -l@cminpack_lib@ @PC_CMINPACK_LIBM@ @PC_CMINPACK_LIBBLAS@ @PC_CMINPACK_LDFLAGS@
+-Cflags: -I${includedir} @CMINPACK_CFLAGS@
++Cflags: -I${includedir} @PC_CMINPACK_CFLAGS@
 diff -up ./CMakeLists.txt.blas ./CMakeLists.txt
 --- ./CMakeLists.txt.blas	2021-02-10 00:05:42.000000000 -0500
-+++ ./CMakeLists.txt	2022-01-22 21:46:21.071270172 -0500
++++ ./CMakeLists.txt	2022-01-22 23:06:24.341783495 -0500
 @@ -3,6 +3,8 @@
  # to the root binary directory of the project as ${CMINPACK_BINARY_DIR}.
  cmake_minimum_required (VERSION 3.0.0)
@@ -31,13 +43,30 @@ diff -up ./CMakeLists.txt.blas ./CMakeLists.txt
  set (CMINPACK_PRECISION "all" CACHE STRING "Precision variants to build ('s', 'd', 'ld', 'all')")
  
  #set (CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/../build)
-@@ -134,6 +137,13 @@ foreach (cminpack_lib ${cminpack_libs})
+@@ -102,10 +105,13 @@ endif ()
+ foreach (cminpack_lib ${cminpack_libs})
+   add_library (${cminpack_lib} ${cminpack_srcs})
+   if (${cminpack_lib} STREQUAL "cminpacks")
+-    target_compile_definitions (cminpacks PUBLIC __cminpack_float__)
++    set (cminpack_real_definition "__cminpack_float__")
+   elseif (${cminpack_lib} STREQUAL "cminpackld")
+-    target_compile_definitions (cminpackld PUBLIC __cminpack_long_double__)
++    set (cminpack_real_definition "__cminpack_long_double__")
++  elseif (${cminpack_lib} STREQUAL "cminpack")
++    set (cminpack_real_definition "__cminpack_double__")
+   endif ()
++  target_compile_definitions (${cminpack_lib} PUBLIC ${cminpack_real_definition})
+ 
+   if (NOT BUILD_SHARED_LIBS AND WIN32)
+     target_compile_definitions (${cminpack_lib} PUBLIC CMINPACK_NO_DLL)
+@@ -134,9 +140,18 @@ foreach (cminpack_lib ${cminpack_libs})
    if (USE_BLAS)
      if (${cminpack_lib} STREQUAL cminpackld)
        message (WARNING "BLAS cannot be used for the extended precision version")
 +    elseif (USE_FLEXIBLAS)
 +      pkg_check_modules (FLEXIBLAS flexiblas)
 +      if (FLEXIBLAS_FOUND)
++        target_include_directories (${cminpack_lib} PUBLIC ${FLEXIBLAS_INCLUDE_DIRS})
 +        target_link_libraries (${cminpack_lib} PUBLIC ${FLEXIBLAS_LIBRARIES})
 +        set_target_properties (${cminpack_lib} PROPERTIES LINK_FLAGS "${FLEXIBLAS_LINK_OPTIONS}")
 +        target_compile_definitions (${cminpack_lib} PUBLIC USE_FLEXIBLAS)
@@ -45,20 +74,38 @@ diff -up ./CMakeLists.txt.blas ./CMakeLists.txt
      else ()
        find_package (CBLAS)
        if (CBLAS_FOUND)
-@@ -161,7 +171,11 @@ foreach (cminpack_lib ${cminpack_libs})
++        target_include_directories (${cminpack_lib} PUBLIC ${CBLAS_INCLUDE_DIRS})
+         target_link_libraries (${cminpack_lib} PUBLIC ${CBLAS_LIBRARIES})
+         set_target_properties (${cminpack_lib} PROPERTIES LINK_FLAGS "${CBLAS_LINKER_FLAGS}")
+         target_compile_definitions (${cminpack_lib} PUBLIC USE_CBLAS)
+@@ -158,11 +173,24 @@ foreach (cminpack_lib ${cminpack_libs})
+     )
+ 
+   set (pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/${cminpack_lib}.pc)
++  # Clear/default PC_ variables from previous loop iterations
++  set (PC_CMINPACK_CFLAGS "-D${cminpack_real_definition}")
++  unset (PC_CMINPACK_CMINPACK_LIBM)
++  unset (PC_CMINPACK_LIBBLAS)
++  unset (PC_CMINPACK_LDFLAGS)
++  unset (PC_CMINPACK_REQUIRES)
++  
++  # Set libm pkgconfig deps
    if (HAVE_LIBM)
      set (PC_CMINPACK_LIBM "-lm")
    endif ()
 -  if (USE_BLAS AND CBLAS_FOUND)
-+  if (USE_BLAS AND FLEXIBLAS_FOUND)
-+    set (PC_CMINPACK_CFlAGS "-DUSE_FLEXIBLAS")
-+    set (PC_CMINPACK_LIBBLAS "-lflexiblas")
-+    set (PC_CMINPACK_LDFLAGS "${FLEXIBLAS_LINK_OPTIONS}")
+-    set (PC_CMINPACK_CFLAGS "-DUSE_CBLAS")
++
++  # Set BLAS pkgconfig deps depending for the BLAS lib being used.
++  if (USE_BLAS AND FLEXIBLAS_FOUND AND NOT ${cminpack_lib} STREQUAL cminpackld)
++    set (PC_CMINPACK_CFLAGS "${PC_CMINPACK_CFLAGS} -DUSE_FLEXIBLAS")
++    set (PC_CMINPACK_REQUIRES "flexiblas")
 +  elseif (USE_BLAS AND CBLAS_FOUND)
-     set (PC_CMINPACK_CFLAGS "-DUSE_CBLAS")
++    set (PC_CMINPACK_CFLAGS "${PC_CMINPACK_CFLAGS} -DUSE_CBLAS")
      if (NOT "${BLAS_LIBRARIES}" STREQUAL "")
        string (REPLACE ";" " -l" PC_CMINPACK_LIBBLAS "${BLAS_LIBRARIES}")
-@@ -175,6 +189,6 @@ foreach (cminpack_lib ${cminpack_libs})
+       set (PC_CMINPACK_LIBBLAS "-l${PC_CMINPACK_LIBBLAS}")
+@@ -175,6 +203,6 @@ foreach (cminpack_lib ${cminpack_libs})
  
  endforeach ()
  
@@ -68,7 +115,7 @@ diff -up ./CMakeLists.txt.blas ./CMakeLists.txt
  add_subdirectory (examples)
 diff -up ./cminpackP.h.blas ./cminpackP.h
 --- ./cminpackP.h.blas	2021-02-10 00:05:42.000000000 -0500
-+++ ./cminpackP.h	2022-01-22 21:44:38.840861495 -0500
++++ ./cminpackP.h	2022-01-22 22:42:26.994629895 -0500
 @@ -6,7 +6,7 @@
  #error "cminpackP.h in an internal cminpack header, and must be included after all other headers (including cminpack.h)"
  #endif
diff --git a/cminpack.spec b/cminpack.spec
index d935f3a..63836b9 100644
--- a/cminpack.spec
+++ b/cminpack.spec
@@ -26,6 +26,7 @@ It is fully re-entrant and thread-safe.
 %package devel
 Summary: Header files and libraries for cminpack
 Requires: %{name} = %{version}-%{release}
+Requires: flexiblas-devel
 
 %description devel
 Contains the development headers and libraries needed to build a program with