- added includes patch (fixes inclusion of AMD/BTF/COLAMD headers); release 2

diff --git a/KLU-includes.patch b/KLU-includes.patch
new file mode 100644 (file)
index 0000000..a8ccd35
--- /dev/null
+++ b/KLU-includes.patch
@@ -0,0 +1,26 @@
+--- KLU/Include/klu.h.orig     2014-03-21 20:21:26.000000000 +0100
++++ KLU/Include/klu.h  2022-12-27 20:29:14.351160837 +0100
+@@ -12,9 +12,9 @@
+ extern "C" {
+ #endif
+ 
+-#include "amd.h"
+-#include "colamd.h"
+-#include "btf.h"
++#include <amd/amd.h>
++#include <colamd/colamd.h>
++#include <btf/btf.h>
+ 
+ /* -------------------------------------------------------------------------- */
+ /* Symbolic object - contains the pre-ordering computed by klu_analyze */
+--- KLU/Include/klu_internal.h.orig    2014-03-21 20:21:26.000000000 +0100
++++ KLU/Include/klu_internal.h 2022-12-27 20:31:27.983770220 +0100
+@@ -8,7 +8,7 @@
+ #define _KLU_INTERNAL_H
+ 
+ #include "klu.h" 
+-#include "btf.h"
++#include <btf/btf.h>
+ #include "klu_version.h"
+ 
+ /* ========================================================================== */

diff --git a/KLU.spec b/KLU.spec
index bdfb61d473dfcc6f87b9f11c74d635730f8e8245..50d4c3dea97ac5e276d857830c5b968aef6106ba 100644 (file)
--- a/KLU.spec
+++ b/KLU.spec
@@ -2,13 +2,14 @@ Summary:      KLU: sparse LU factorization, for circuit simulation
 Summary(pl.UTF-8):     KLU - rzadki rozkład LU na potrzeby symulacji obwodów
 Name:          KLU
 Version:       1.3.0
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/klu/%{name}-%{version}.tar.gz
 # Source0-md5: 401224a68ae185743da5f0e5808d03dc
 Patch0:                %{name}-ufconfig.patch
 Patch1:                %{name}-shared.patch
+Patch2:                %{name}-includes.patch
 URL:           http://www.cise.ufl.edu/research/sparse/klu/
 BuildRequires: AMD-devel >= 2.4.0
 BuildRequires: BTF-devel >= 1.2.0
@@ -61,6 +62,7 @@ Statyczna biblioteka KLU.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} \
@@ -77,7 +79,7 @@ install -d $RPM_BUILD_ROOT%{_includedir}/klu
        DESTDIR=$RPM_BUILD_ROOT \
        libdir=%{_libdir}
 
-install Include/*.h $RPM_BUILD_ROOT%{_includedir}/klu
+cp -p Include/*.h $RPM_BUILD_ROOT%{_includedir}/klu
 
 %clean
 rm -rf $RPM_BUILD_ROOT