From: Jakub Bogusz Date: Thu, 2 Oct 2014 16:21:29 +0000 (+0200) Subject: - updated to 2.9.0 X-Git-Tag: auto/th/COLAMD-2.9.0-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2FCOLAMD.git;a=commitdiff_plain;h=23d2a54603de0c01cda6c817411d2d36c5a0231b - updated to 2.9.0 - updated ufconfig,shared patches --- diff --git a/COLAMD.spec b/COLAMD.spec index 5232a58..37402f8 100644 --- a/COLAMD.spec +++ b/COLAMD.spec @@ -1,17 +1,18 @@ Summary: COLAMD: column approximate minimum degree Summary(pl.UTF-8): COLAMD - przybliżony algorytm minimalnego stopnia dla kolumn Name: COLAMD -Version: 2.8.0 +Version: 2.9.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://www.cise.ufl.edu/research/sparse/colamd/%{name}-%{version}.tar.gz -# Source0-md5: 482dc4f958c2dafdd430d4c3148d15c5 +# Source0-md5: 6a636d88f4ee6475a5ae2513a1a27544 Patch0: colamd-ufconfig.patch Patch1: colamd-shared.patch URL: http://www.cise.ufl.edu/research/sparse/colamd/ -BuildRequires: SuiteSparse_config >= 4.0.0 +BuildRequires: SuiteSparse_config >= 4.3.0 BuildRequires: libtool >= 2:1.5 +Requires: SuiteSparse_config-libs >= 4.3.0 Obsoletes: colamd BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,7 +45,7 @@ Summary: Header files for COLAMD library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki COLAMD Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: SuiteSparse_config >= 4.0.0 +Requires: SuiteSparse_config >= 4.3.0 Obsoletes: colamd-devel %description devel diff --git a/colamd-shared.patch b/colamd-shared.patch index 6725e61..33b91d0 100644 --- a/colamd-shared.patch +++ b/colamd-shared.patch @@ -1,23 +1,22 @@ -diff -ur COLAMD/Demo/Makefile COLAMD-shared/Demo/Makefile ---- COLAMD/Demo/Makefile 2007-12-02 15:48:48.000000000 +0100 -+++ COLAMD-shared/Demo/Makefile 2007-12-02 15:48:31.000000000 +0100 -@@ -20,12 +20,12 @@ +--- COLAMD/Demo/Makefile.orig 2014-10-01 21:32:41.549424470 +0200 ++++ COLAMD/Demo/Makefile 2014-10-02 17:21:56.629763313 +0200 +@@ -23,12 +23,12 @@ dist: colamd_example: colamd_example.c library -- $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a -lm -+ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_example colamd_example.c ../Lib/libcolamd.la -lm +- $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a $(LIB2) ++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_example colamd_example.c ../Lib/libcolamd.la $(LIB2) - ./colamd_example > my_colamd_example.out - diff colamd_example.out my_colamd_example.out colamd_l_example: colamd_l_example.c library -- $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a -lm -+ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la -lm +- $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a $(LIB2) ++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la $(LIB2) - ./colamd_l_example > my_colamd_l_example.out - - diff colamd_example.out my_colamd_example.out + - diff colamd_l_example.out my_colamd_l_example.out ---- COLAMD/Lib/Makefile.orig 2012-01-01 14:26:08.932964237 +0100 -+++ COLAMD/Lib/Makefile 2012-01-01 14:27:54.886301117 +0100 +--- COLAMD/Lib/Makefile.orig 2014-10-02 17:24:27.669756976 +0200 ++++ COLAMD/Lib/Makefile 2014-10-02 18:14:05.969631988 +0200 @@ -2,7 +2,8 @@ # COLAMD Makefile #------------------------------------------------------------------------------- @@ -28,25 +27,23 @@ diff -ur COLAMD/Demo/Makefile COLAMD-shared/Demo/Makefile include /usr/share/misc/SuiteSparse_config.mk -@@ -13,16 +14,19 @@ - SRC = ../Source/colamd.c ../Source/colamd_global.c +@@ -13,15 +14,18 @@ + SRC = ../Source/colamd.c # creates libcolamd.a, a C-callable COLAMD library -libcolamd.a: $(SRC) $(INC) -- $(CC) $(CF) $(I) -c ../Source/colamd_global.c - $(CC) $(CF) $(I) -c ../Source/colamd.c - $(CC) $(CF) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o -- $(ARCHIVE) libcolamd.a colamd.o colamd_l.o colamd_global.o +- $(ARCHIVE) libcolamd.a colamd.o colamd_l.o - - $(RANLIB) libcolamd.a +libcolamd.la: $(SRC) $(INC) -+ libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/colamd_global.c + libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/colamd.c + libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o -+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcolamd.la -rpath $(libdir) colamd.lo colamd_l.lo colamd_global.lo -lm ++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o libcolamd.la -rpath $(libdir) colamd.lo colamd_l.lo -lsuitesparseconfig -lm + +install: libcolamd.la + install -d $(DESTDIR)$(libdir) -+ libtool --mode=install cp libcolamd.la $(DESTDIR)$(libdir)/libcolamd.la ++ libtool --mode=install install libcolamd.la $(DESTDIR)$(libdir) + +ccode: libcolamd.la @@ -57,7 +54,7 @@ diff -ur COLAMD/Demo/Makefile COLAMD-shared/Demo/Makefile clean: - $(RM) $(CLEAN) -@@ -30,4 +34,4 @@ +@@ -29,4 +33,4 @@ purge: distclean distclean: clean diff --git a/colamd-ufconfig.patch b/colamd-ufconfig.patch index faa9852..c0ec948 100644 --- a/colamd-ufconfig.patch +++ b/colamd-ufconfig.patch @@ -20,10 +20,9 @@ # Compile all C code, including the C-callable routine and the mexFunctions. # Do not the MATLAB interface. -diff -ur COLAMD/Demo/Makefile COLAMD.UF/Demo/Makefile --- COLAMD/Demo/Makefile 2007-05-05 15:42:44.000000000 +0200 +++ COLAMD.UF/Demo/Makefile 2007-12-02 15:41:19.000000000 +0100 -@@ -4,9 +4,9 @@ +@@ -4,16 +4,15 @@ default: colamd_example colamd_l_example @@ -33,8 +32,16 @@ diff -ur COLAMD/Demo/Makefile COLAMD.UF/Demo/Makefile -I = -I../Include -I../../SuiteSparse_config +I = -I../Include - C = $(CC) $(CFLAGS) $(I) + C = $(CC) $(CF) $(I) +-LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB) ++LIB2 = -lsuitesparseconfig $(LIB) + + library: +- ( cd ../../SuiteSparse_config ; $(MAKE) ) + ( cd ../Lib ; $(MAKE) ) + + #------------------------------------------------------------------------------ diff -ur COLAMD/Lib/Makefile COLAMD.UF/Lib/Makefile --- COLAMD/Lib/Makefile 2007-05-05 15:41:47.000000000 +0200 +++ COLAMD.UF/Lib/Makefile 2007-12-02 15:42:02.000000000 +0100