packages: KLU/KLU-shared.patch, KLU/KLU-ufconfig.patch, KLU/KLU.spec - upda...

qboosh qboosh at pld-linux.org
Fri Jun 29 16:18:09 CEST 2012 

Author: qboosh                       Date: Fri Jun 29 14:18:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.0; switched to SuiteSparse_config
- updated ufconfig,shared patches

---- Files affected:
packages/KLU:
   KLU-shared.patch (1.2 -> 1.3) , KLU-ufconfig.patch (1.1 -> 1.2) , KLU.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/KLU/KLU-shared.patch
diff -u packages/KLU/KLU-shared.patch:1.2 packages/KLU/KLU-shared.patch:1.3
--- packages/KLU/KLU-shared.patch:1.2	Sun Jan 29 21:27:09 2012
+++ packages/KLU/KLU-shared.patch	Fri Jun 29 16:18:03 2012
@@ -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
- 
- 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
- 
- 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
+ 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 $(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 $(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

================================================================
Index: packages/KLU/KLU-ufconfig.patch
diff -u packages/KLU/KLU-ufconfig.patch:1.1 packages/KLU/KLU-ufconfig.patch:1.2
--- packages/KLU/KLU-ufconfig.patch:1.1	Tue Jan 10 19:33:59 2012
+++ packages/KLU/KLU-ufconfig.patch	Fri Jun 29 16:18:03 2012
@@ -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
  

================================================================
Index: packages/KLU/KLU.spec
diff -u packages/KLU/KLU.spec:1.2 packages/KLU/KLU.spec:1.3
--- packages/KLU/KLU.spec:1.2	Sun Jan 29 21:27:09 2012
+++ packages/KLU/KLU.spec	Fri Jun 29 16:18:03 2012
@@ -2,20 +2,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
@@ -31,10 +34,10 @@
 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.
@@ -105,6 +108,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/06/29 14:18:03  qboosh
+- updated to 1.2.0; switched to SuiteSparse_config
+- updated ufconfig,shared patches
+
 Revision 1.2  2012/01/29 20:27:09  qboosh
 - updated to 1.1.4
 - updated shared patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/KLU/KLU-shared.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/KLU/KLU-ufconfig.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/KLU/KLU.spec?r1=1.2&r2=1.3

More information about the pld-cvs-commit mailing list