[packages/SuiteSparse] - updated to 5.1.2 (new SuiteSparse_config soname) - fixed -AMD-static dependency - release 2 (libs
qboosh
qboosh at pld-linux.org
Fri Jan 13 16:51:26 CET 2023
commit 6a10c51536fc82853bbb1be4e6006b5df7b8ee70
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jan 13 16:52:32 2023 +0100
- updated to 5.1.2 (new SuiteSparse_config soname)
- fixed -AMD-static dependency
- release 2 (libs versions unchanged since 4.5.6)
SuiteSparse-config.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++
SuiteSparse-externc.patch | 6 +++---
SuiteSparse.spec | 12 +++++------
3 files changed, 62 insertions(+), 9 deletions(-)
---
diff --git a/SuiteSparse.spec b/SuiteSparse.spec
index a702e4a..d2e2369 100644
--- a/SuiteSparse.spec
+++ b/SuiteSparse.spec
@@ -4,7 +4,7 @@
%bcond_without metis # partition support (using metis lib)
# main package version
-%define suite_ver 4.5.6
+%define suite_ver 5.1.2
# see */Include/*.h /VER(SION)?_CODE, C*Sparse/Include/cs.h /CS_VER
%define amd_ver 2.4.6
%define btf_ver 1.2.6
@@ -12,7 +12,7 @@
%define ccolamd_ver 2.9.6
%define colamd_ver 2.9.6
%define cholmod_ver 3.0.11
-%define csparse_ver 3.1.9
+%define csparse_ver 3.2.0
%define cxsparse_ver 3.1.9
%define klu_ver 1.3.8
%define ldl_ver 2.2.6
@@ -26,11 +26,11 @@ Summary: A Suite of Sparse matrix packages
Summary(pl.UTF-8): Zbiór pakietów do operacji na macierzach rzadkich
Name: SuiteSparse
Version: %{suite_ver}
-Release: 1
+Release: 2
License: LGPL v2.1+, GPL v2+
Group: Libraries
Source0: https://people.engr.tamu.edu/davis/SuiteSparse/%{name}-%{version}.tar.gz
-# Source0-md5: eeb87a842a9b3b0425cf08d97fb3c5ec
+# Source0-md5: e878549ef1060c01cdcedf323191be74
Patch0: %{name}-config.patch
Patch1: %{name}-amdf77.patch
Patch2: %{name}-externc.patch
@@ -159,7 +159,7 @@ Summary(pl.UTF-8): Statyczna biblioteka AMD
Version: %{amd_ver}
License: LGPL v2.1+
Group: Development/Libraries
-Requires: %{name}-devel = %{amd_ver}-%{release}
+Requires: %{name}-AMD-devel = %{amd_ver}-%{release}
Obsoletes: AMD-static < 2.4.0-5
%description AMD-static
@@ -934,7 +934,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc SuiteSparse_config/README.txt
%attr(755,root,root) %{_libdir}/libsuitesparseconfig.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsuitesparseconfig.so.4
+%attr(755,root,root) %ghost %{_libdir}/libsuitesparseconfig.so.5
%files config-devel
%defattr(644,root,root,755)
diff --git a/SuiteSparse-config.patch b/SuiteSparse-config.patch
index 534311b..8dc8d65 100644
--- a/SuiteSparse-config.patch
+++ b/SuiteSparse-config.patch
@@ -36,3 +36,56 @@
endif
#---------------------------------------------------------------------------
+--- SuiteSparse/CSparse/Lib/Makefile.orig 2017-12-23 20:00:31.000000000 +0100
++++ SuiteSparse/CSparse/Lib/Makefile 2023-01-13 16:42:59.747528205 +0100
+@@ -15,7 +15,7 @@
+ # CSparse/Lib. It does not install it for system-wide usage.
+
+ LIBRARY = libcsparse
+-CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O
++CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH)
+
+ I = -I../Include
+ RANLIB = ranlib
+--- SuiteSparse/CSparse/Demo/Makefile.orig 2017-12-23 20:05:19.000000000 +0100
++++ SuiteSparse/CSparse/Demo/Makefile 2023-01-13 16:43:15.587442393 +0100
+@@ -1,4 +1,4 @@
+-CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O
++CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH)
+ I = -I../Include
+
+ LDLIBS += -lm
+--- SuiteSparse/Makefile.orig 2017-12-22 23:45:29.000000000 +0100
++++ SuiteSparse/Makefile 2023-01-12 20:49:33.288787014 +0100
+@@ -12,7 +12,6 @@ include SuiteSparse_config/SuiteSparse_c
+ # Compile the default rules for each package
+ go: metis
+ ( cd SuiteSparse_config && $(MAKE) )
+- ( cd GraphBLAS && $(MAKE) )
+ ( cd AMD && $(MAKE) )
+ ( cd BTF && $(MAKE) )
+ ( cd CAMD && $(MAKE) )
+@@ -37,7 +36,6 @@ endif
+ # (note that CSparse is not installed; CXSparse is installed instead)
+ install: metisinstall
+ ( cd SuiteSparse_config && $(MAKE) install )
+- ( cd GraphBLAS && $(MAKE) install )
+ ( cd AMD && $(MAKE) install )
+ ( cd BTF && $(MAKE) install )
+ ( cd CAMD && $(MAKE) install )
+@@ -113,7 +111,6 @@ endif
+ # static library
+ library: metis
+ ( cd SuiteSparse_config && $(MAKE) )
+- ( cd GraphBLAS && $(MAKE) library )
+ ( cd AMD && $(MAKE) library )
+ ( cd BTF && $(MAKE) library )
+ ( cd CAMD && $(MAKE) library )
+@@ -211,7 +208,6 @@ clean:
+
+ # Create the PDF documentation
+ docs:
+- ( cd GraphBLAS && $(MAKE) docs )
+ ( cd AMD && $(MAKE) docs )
+ ( cd CAMD && $(MAKE) docs )
+ ( cd KLU && $(MAKE) docs )
diff --git a/SuiteSparse-externc.patch b/SuiteSparse-externc.patch
index 4dba0f6..e4520db 100644
--- a/SuiteSparse-externc.patch
+++ b/SuiteSparse-externc.patch
@@ -399,10 +399,10 @@
-#endif
-
#endif
---- SuiteSparse/CSparse/Include/cs.h.orig 2016-05-04 21:43:53.000000000 +0200
-+++ SuiteSparse/CSparse/Include/cs.h 2023-01-11 20:42:11.645915233 +0100
+--- SuiteSparse/CSparse/Include/cs.h.orig 2017-09-12 18:46:19.000000000 +0200
++++ SuiteSparse/CSparse/Include/cs.h 2023-01-12 18:45:36.412409364 +0100
@@ -14,6 +14,10 @@
- #define CS_DATE "May 4, 2016" /* CSparse release date */
+ #define CS_DATE "Sept 12, 2017" /* CSparse release date */
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2016"
+#ifdef __cplusplus
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SuiteSparse.git/commitdiff/6a10c51536fc82853bbb1be4e6006b5df7b8ee70
More information about the pld-cvs-commit
mailing list