Author: qboosh Date: Sun Jan 1 14:00:09 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.7.4 - updated shared patch
---- Files affected: packages/COLAMD: COLAMD.spec (1.17 -> 1.18) , colamd-shared.patch (1.5 -> 1.6) ---- Diffs: ================================================================ Index: packages/COLAMD/COLAMD.spec diff -u packages/COLAMD/COLAMD.spec:1.17 packages/COLAMD/COLAMD.spec:1.18 --- packages/COLAMD/COLAMD.spec:1.17 Thu Jan 27 19:49:51 2011 +++ packages/COLAMD/COLAMD.spec Sun Jan 1 15:00:04 2012 @@ -2,16 +2,16 @@ Summary: COLAMD: column approximate minimum degree Summary(pl.UTF-8): COLAMD - przybliżony algorytm minimalnego stopnia dla kolumn Name: COLAMD -Version: 2.7.3 +Version: 2.7.4 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://www.cise.ufl.edu/research/sparse/colamd/%{name}-%{version}.tar.gz -# Source0-md5: 7f41dd0e49d6db367f74e8c7a5e60918 +# Source0-md5: 186d692ab7211e79f9b727d8192635f7 Patch0: colamd-ufconfig.patch Patch1: colamd-shared.patch URL: http://www.cise.ufl.edu/research/sparse/colamd/ -BuildRequires: UFconfig +BuildRequires: UFconfig >= 3.7.0 BuildRequires: libtool >= 2:1.5 Obsoletes: colamd BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -45,7 +45,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki COLAMD Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: UFconfig +Requires: UFconfig >= 3.7.0 Obsoletes: colamd-devel %description devel @@ -117,6 +117,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2012/01/01 14:00:04 qboosh +- updated to 2.7.4 +- updated shared patch + Revision 1.17 2011/01/27 18:49:51 qboosh - updated to 2.7.3 ================================================================ Index: packages/COLAMD/colamd-shared.patch diff -u packages/COLAMD/colamd-shared.patch:1.5 packages/COLAMD/colamd-shared.patch:1.6 --- packages/COLAMD/colamd-shared.patch:1.5 Wed Dec 26 18:29:56 2007 +++ packages/COLAMD/colamd-shared.patch Sun Jan 1 15:00:04 2012 @@ -6,19 +6,18 @@ colamd_example: colamd_example.c library - $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a -lm -+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o colamd_example colamd_example.c ../Lib/libcolamd.la -lm ++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_example colamd_example.c ../Lib/libcolamd.la -lm - ./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 $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la -lm ++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la -lm - ./colamd_l_example > my_colamd_l_example.out - diff colamd_example.out my_colamd_example.out -diff -ur COLAMD/Lib/Makefile COLAMD-shared/Lib/Makefile ---- COLAMD/Lib/Makefile 2007-12-02 15:48:48.000000000 +0100 -+++ COLAMD-shared/Lib/Makefile 2007-12-02 15:47:12.000000000 +0100 +--- COLAMD/Lib/Makefile.orig 2012-01-01 14:26:08.932964237 +0100 ++++ COLAMD/Lib/Makefile 2012-01-01 14:27:54.886301117 +0100 @@ -2,7 +2,8 @@ # COLAMD Makefile #------------------------------------------------------------------------------- @@ -29,35 +28,36 @@ include /usr/share/misc/UFconfig.mk -@@ -13,15 +14,20 @@ +@@ -13,16 +14,19 @@ SRC = ../Source/colamd.c ../Source/colamd_global.c # creates libcolamd.a, a C-callable COLAMD library -libcolamd.a: $(SRC) $(INC) -- $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c -- $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -- $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o -- $(AR) libcolamd.a colamd.o colamd_l.o colamd_global.o -+libcolamd.a: libcolamd.la +- $(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 +- - $(RANLIB) libcolamd.a +libcolamd.la: $(SRC) $(INC) -+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c -+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.lo ++ 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 + +install: libcolamd.la + install -d $(DESTDIR)$(libdir) + libtool --mode=install cp libcolamd.la $(DESTDIR)$(libdir)/libcolamd.la - --ccode: libcolamd.a ++ +ccode: libcolamd.la +-ccode: libcolamd.a +- -library: libcolamd.a +library: libcolamd.la clean: - $(RM) $(CLEAN) -@@ -29,4 +35,4 @@ +@@ -30,4 +34,4 @@ purge: distclean distclean: clean ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/COLAMD/COLAMD.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/COLAMD/colamd-shared.patch?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
