- updated to 1.2.0; switched to SuiteSparse_config

- updated ufconfig,shared patches

Changed files:
    KLU-shared.patch -> 1.3
    KLU-ufconfig.patch -> 1.2
    KLU.spec -> 1.3

diff --git a/KLU-shared.patch b/KLU-shared.patch
index 7b85b757c240e5e5b7c7bf758ee07c05ccaeb5c0..170913c68031b108d9ff2f18d75371b6ba01c63f 100644 (file)
--- 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-01-29 18:59:19.771183432 +0100
-+++ KLU/Demo/Makefile  2012-01-29 21:26:17.944812032 +0100
+--- KLU/Demo/Makefile.orig     2012-06-28 21:31:19.924474872 +0200
++++ KLU/Demo/Makefile  2012-06-29 15:28:57.281761459 +0200
 @@ -5,7 +5,7 @@
  
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
  
--LIB = ../Lib/libklu.a -lbtf -lamd -lcolamd
-+LIB = ../Lib/libklu.la -lbtf -lamd -lcolamd
+-CLIB = ../Lib/libklu.a  -lbtf -lamd -lcolamd
++CLIB = ../Lib/libklu.la  -lbtf -lamd -lcolamd
  
  CHOLMOD = -lcholmod
  
@@ -300,15 +300,15 @@
 @@ -40,11 +40,11 @@
        - $(RM) $(CLEAN)
  
- kludemo: kludemo.c Makefile $(LIB)
--      $(CC) $(CF) $(I) kludemo.c -o kludemo $(LIB) $(CHOLMOD) -lm
-+      libtool --tag=CC --mode=link $(CC) $(CF) $(I) kludemo.c -o kludemo $(LIB) $(CHOLMOD) -lm
+ kludemo: kludemo.c Makefile $(CLIB)
+-      $(CC) $(CF) $(I) kludemo.c -o kludemo $(CLIB) $(CHOLMOD) $(LIB)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) kludemo.c -o kludemo $(CLIB) $(CHOLMOD) $(LIB)
  
- kluldemo: kludemo.c Makefile $(LIB)
--      $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(LIB) $(CHOLMOD) -lm
-+      libtool --tag=CC --mode=link $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(LIB) $(CHOLMOD) -lm
+ kluldemo: kludemo.c Makefile $(CLIB)
+-      $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(CLIB) $(CHOLMOD) $(LIB)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) kluldemo.c -o kluldemo $(CLIB) $(CHOLMOD) $(LIB)
  
- klu_simple: klu_simple.c Makefile $(LIB)
--      $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(LIB) -lm
-+      libtool --tag=CC --mode=link $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(LIB) -lm
+ klu_simple: klu_simple.c Makefile $(CLIB)
+-      $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(CLIB) $(LIB)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) klu_simple.c -o klu_simple $(CLIB) $(LIB)
        - ./klu_simple

diff --git a/KLU-ufconfig.patch b/KLU-ufconfig.patch
index 027ac98d1e24265cadef2742ca44b851d4d5f3c3..14b384b7637df2f62affca5c8a569bc5f45763e7 100644 (file)
--- a/KLU-ufconfig.patch
+++ b/KLU-ufconfig.patch
@@ -4,8 +4,8 @@
  
  default: demos
  
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  demos:
        ( cd Lib ; $(MAKE) )
@@ -15,8 +15,8 @@
  
  ccode: all
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  # for testing only:
  # TEST = -DTESTING
@@ -24,40 +24,41 @@
  C = $(CC) $(CFLAGS)
  
  INC = ../Include/klu.h ../Include/klu_internal.h ../Include/klu_version.h \
--    ../../UFconfig/UFconfig.h Makefile
+-    ../../SuiteSparse_config/SuiteSparse_config.h Makefile
 +    Makefile
  
 -I = -I../../AMD/Include -I../../COLAMD/Include -I../../BTF/Include \
--    -I../Include -I../../UFconfig
+-    -I../Include -I../../SuiteSparse_config
 +I = -I/usr/include/amd -I/usr/include/colamd -I/usr/include/btf \
 +    -I../Include
  
  all: library
  
---- KLU/Demo/Makefile.orig     2009-11-11 21:13:13.000000000 +0100
-+++ KLU/Demo/Makefile  2012-01-10 18:40:07.339511379 +0100
-@@ -3,15 +3,14 @@
+--- 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 @@
  
  default: all
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--LIB = ../Lib/libklu.a  ../../BTF/Lib/libbtf.a \
+-CLIB = ../Lib/libklu.a  ../../BTF/Lib/libbtf.a \
 -      ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a
-+LIB = ../Lib/libklu.a -lbtf -lamd -lcolamd
++CLIB = ../Lib/libklu.a  -lbtf -lamd -lcolamd
  
--CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a
+-CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
+-        ../../SuiteSparse_config/libsuitesparseconfig.a
 +CHOLMOD = -lcholmod
  
--I = -I../../UFconfig -I../../AMD/Include -I../../COLAMD/Include \
+-I = -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include \
 -      -I../../BTF/Include -I../Include -I../../CHOLMOD/Include
 +I = -I/usr/include/amd -I/usr/include/colamd \
 +      -I/usr/include/btf -I../Include -I/usr/include/cholmod
  
- all: $(LIB) klu_simple $(CHOLMOD) kludemo kluldemo
+ all: $(CLIB) klu_simple $(CHOLMOD) kludemo kluldemo
        - ./klu_simple
-@@ -31,21 +30,6 @@
+@@ -32,24 +30,6 @@
  ../Lib/libklu.a:
        ( cd ../Lib ; $(MAKE) )
  
@@ -75,6 +76,9 @@
 -#     ( cd ../../CAMD ; $(MAKE) )
 -#     ( cd ../../CCOLAMD ; $(MAKE) )
 -#     ( cd ../../metis-4.0 ; $(MAKE) )
+-
+-../../SuiteSparse_config/libsuitesparseconfig.a:
+-      ( cd ../../SuiteSparse_config ; $(MAKE) )
 -
  purge: distclean
  

diff --git a/KLU.spec b/KLU.spec
index 339e01b5c34a380d8ce399deeb41f580ebb1031b..57319c48ed0da76991ce5fab6140c66285413f07 100644 (file)
--- a/KLU.spec
+++ b/KLU.spec
@@ -1,20 +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.1.4
+Version:       1.2.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/klu/%{name}-%{version}.tar.gz
-# Source0-md5: 72b19725946a8bb5f5fbbedb9defddf3
+# Source0-md5: e656523b71364e17b3b9e7ba3fc3981b
 Patch0:                %{name}-ufconfig.patch
 Patch1:                %{name}-shared.patch
 URL:           http://www.cise.ufl.edu/research/sparse/klu/
-BuildRequires: AMD-devel >= 2.2.3
-BuildRequires: BTF-devel >= 1.1.3
-BuildRequires: COLAMD-devel >= 2.7.4
-BuildRequires: UFconfig >= 3.7.0
+BuildRequires: AMD-devel >= 2.3.0
+BuildRequires: BTF-devel >= 1.2.0
+BuildRequires: COLAMD-devel >= 2.8.0
+BuildRequires: SuiteSparse_config >= 4.0.0
 BuildRequires: libtool >= 2:1.5
+Requires:      AMD >= 2.3.0
+Requires:      BTF >= 1.2.0
+Requires:      COLAMD >= 2.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,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.2.3
-Requires:      BTF-devel >= 1.1.3
-Requires:      COLAMD-devel >= 2.7.4
-Requires:      UFconfig >= 3.7.0
+Requires:      AMD-devel >= 2.3.0
+Requires:      BTF-devel >= 1.2.0
+Requires:      COLAMD-devel >= 2.8.0
+Requires:      SuiteSparse_config >= 4.0.0
 
 %description devel
 Header files for KLU library.