[packages/KLU] - updated to 1.3.0 - updated ufconfig,shared patches

[qboosh]

commit 8b190b63e22e93f640ff825c5a1e01053d3ab5f8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Oct 3 16:55:14 2014 +0200

    - updated to 1.3.0
    - updated ufconfig,shared patches

 KLU-shared.patch   |  8 ++++----
 KLU-ufconfig.patch | 30 +++++++++++++++++++-----------
 KLU.spec           | 20 ++++++++++----------
 3 files changed, 33 insertions(+), 25 deletions(-)
---
diff --git a/KLU.spec b/KLU.spec
index 57319c4..0c7b351 100644
--- a/KLU.spec
+++ b/KLU.spec
@@ -1,23 +1,23 @@
 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.2.0
+Version:	1.3.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.cise.ufl.edu/research/sparse/klu/%{name}-%{version}.tar.gz
-# Source0-md5:	e656523b71364e17b3b9e7ba3fc3981b
+# Source0-md5:	401224a68ae185743da5f0e5808d03dc
 Patch0:		%{name}-ufconfig.patch
 Patch1:		%{name}-shared.patch
 URL:		http://www.cise.ufl.edu/research/sparse/klu/
-BuildRequires:	AMD-devel >= 2.3.0
+BuildRequires:	AMD-devel >= 2.4.0
 BuildRequires:	BTF-devel >= 1.2.0
-BuildRequires:	COLAMD-devel >= 2.8.0
-BuildRequires:	SuiteSparse_config >= 4.0.0
+BuildRequires:	COLAMD-devel >= 2.9.0
+BuildRequires:	SuiteSparse_config >= 4.3.0
 BuildRequires:	libtool >= 2:1.5
-Requires:	AMD >= 2.3.0
+Requires:	AMD >= 2.4.0
 Requires:	BTF >= 1.2.0
-Requires:	COLAMD >= 2.8.0
+Requires:	COLAMD >= 2.9.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,10 +33,10 @@ Summary:	Header files for KLU library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki KLU
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	AMD-devel >= 2.3.0
+Requires:	AMD-devel >= 2.4.0
 Requires:	BTF-devel >= 1.2.0
-Requires:	COLAMD-devel >= 2.8.0
-Requires:	SuiteSparse_config >= 4.0.0
+Requires:	COLAMD-devel >= 2.9.0
+Requires:	SuiteSparse_config >= 4.3.0
 
 %description devel
 Header files for KLU library.
diff --git a/KLU-shared.patch b/KLU-shared.patch
index 170913c..33dff17 100644
--- a/KLU-shared.patch
+++ b/KLU-shared.patch
@@ -277,14 +277,14 @@
 +	libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@
  
  #-------------------------------------------------------------------------------
---- KLU/Demo/Makefile.orig	2012-06-28 21:31:19.924474872 +0200
-+++ KLU/Demo/Makefile	2012-06-29 15:28:57.281761459 +0200
+--- KLU/Demo/Makefile.orig	2014-10-03 16:36:48.796251087 +0200
++++ KLU/Demo/Makefile	2014-10-03 16:39:42.522910463 +0200
 @@ -5,7 +5,7 @@
  
  include /usr/share/misc/SuiteSparse_config.mk
  
--CLIB = ../Lib/libklu.a  -lbtf -lamd -lcolamd
-+CLIB = ../Lib/libklu.la  -lbtf -lamd -lcolamd
+-CLIB = ../Lib/libklu.a -lbtf -lamd -lcolamd -lsuitesparseconfig
++CLIB = ../Lib/libklu.la -lbtf -lamd -lcolamd -lsuitesparseconfig
  
  CHOLMOD = -lcholmod
  
diff --git a/KLU-ufconfig.patch b/KLU-ufconfig.patch
index 14b384b..79e1613 100644
--- a/KLU-ufconfig.patch
+++ b/KLU-ufconfig.patch
@@ -34,9 +34,9 @@
  
  all: library
  
---- KLU/Demo/Makefile.orig	2012-05-28 15:30:41.000000000 +0200
-+++ KLU/Demo/Makefile	2012-06-28 21:30:59.997809043 +0200
-@@ -3,16 +3,14 @@
+--- KLU/Demo/Makefile.orig	2014-03-21 20:21:27.000000000 +0100
++++ KLU/Demo/Makefile	2014-10-03 16:36:20.732918931 +0200
+@@ -3,23 +3,16 @@
  
  default: all
  
@@ -44,21 +44,29 @@
 +include /usr/share/misc/SuiteSparse_config.mk
  
 -CLIB = ../Lib/libklu.a  ../../BTF/Lib/libbtf.a \
--	../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a
-+CLIB = ../Lib/libklu.a  -lbtf -lamd -lcolamd
- 
--CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
+-	../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a \
 -        ../../SuiteSparse_config/libsuitesparseconfig.a
++CLIB = ../Lib/libklu.a -lbtf -lamd -lcolamd -lsuitesparseconfig
+ 
+-CHOLMOD_LIB = ../../CHOLMOD/Lib/libcholmod.a
+-CHOLMOD = $(CHOLMOD_LIB) $(LAPACK) $(BLAS) $(XERBLA)
 +CHOLMOD = -lcholmod
  
--I = -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include \
--	-I../../BTF/Include -I../Include -I../../CHOLMOD/Include
+-ifneq ($(GPU_CONFIG),)
+-CHOLMOD += $(CUDART_LIB) $(CUBLAS_LIB) 
+-endif
 +I = -I/usr/include/amd -I/usr/include/colamd \
 +	-I/usr/include/btf -I../Include -I/usr/include/cholmod
  
- all: $(CLIB) klu_simple $(CHOLMOD) kludemo kluldemo
+-I = -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include \
+-	-I../../BTF/Include -I../Include -I../../CHOLMOD/Include
+-
+-all: $(CLIB) klu_simple $(CHOLMOD_LIB) kludemo kluldemo
++all: $(CLIB) klu_simple kludemo kluldemo
  	- ./klu_simple
-@@ -32,24 +30,6 @@
+ 	- ./kludemo < ../Matrix/1c.mtx
+ 	- ./kludemo < ../Matrix/arrowc.mtx
+@@ -37,24 +30,6 @@
  ../Lib/libklu.a:
  	( cd ../Lib ; $(MAKE) )
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/KLU.git/commitdiff/8b190b63e22e93f640ff825c5a1e01053d3ab5f8