packages: CCOLAMD/CCOLAMD.spec, CCOLAMD/ccolamd-shared.patch - updated to 2...

[qboosh]

Author: qboosh                       Date: Sun Jan  1 14:58:02 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.7.4
- updated shared patch

---- Files affected:
packages/CCOLAMD:
   CCOLAMD.spec (1.12 -> 1.13) , ccolamd-shared.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/CCOLAMD/CCOLAMD.spec
diff -u packages/CCOLAMD/CCOLAMD.spec:1.12 packages/CCOLAMD/CCOLAMD.spec:1.13
--- packages/CCOLAMD/CCOLAMD.spec:1.12	Thu Jan 27 19:53:49 2011
+++ packages/CCOLAMD/CCOLAMD.spec	Sun Jan  1 15:57:56 2012
@@ -2,16 +2,16 @@
 Summary:	CCOLAMD: constrained column approximate minimum degree
 Summary(pl.UTF-8):	CCOLAMD - przybliżony ograniczony algorytm minimalnego stopnia dla kolumn
 Name:		CCOLAMD
-Version:	2.7.3
+Version:	2.7.4
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.cise.ufl.edu/research/sparse/ccolamd/%{name}-%{version}.tar.gz
-# Source0-md5:	eca668f34143c9ffa3901998c5f0bdf2
+# Source0-md5:	bb55f6b4b9358160eaba1a57f863c65e
 Patch0:		ccolamd-ufconfig.patch
 Patch1:		ccolamd-shared.patch
 URL:		http://www.cise.ufl.edu/research/sparse/ccolamd/
-BuildRequires:	UFconfig
+BuildRequires:	UFconfig >= 3.7.0
 BuildRequires:	libtool >= 2:1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,7 +40,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki CCOLAMD
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	UFconfig
+Requires:	UFconfig >= 3.7.0
 
 %description devel
 Header files for CCOLAMD library.
@@ -110,6 +110,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2012/01/01 14:57:56  qboosh
+- updated to 2.7.4
+- updated shared patch
+
 Revision 1.12  2011/01/27 18:53:49  qboosh
 - updated to 2.7.3
 

================================================================
Index: packages/CCOLAMD/ccolamd-shared.patch
diff -u packages/CCOLAMD/ccolamd-shared.patch:1.4 packages/CCOLAMD/ccolamd-shared.patch:1.5
--- packages/CCOLAMD/ccolamd-shared.patch:1.4	Wed Dec 26 13:47:50 2007
+++ packages/CCOLAMD/ccolamd-shared.patch	Sun Jan  1 15:57:57 2012
@@ -6,19 +6,18 @@
  
  ccolamd_example: ccolamd_example.c library
 -	$(C) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.a -lm
-+	libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.la -lm
++	libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.la -lm
  	- ./ccolamd_example > my_ccolamd_example.out
  	- diff ccolamd_example.out my_ccolamd_example.out
  
  ccolamd_l_example: ccolamd_l_example.c library
 -	$(C) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.a -lm
-+	libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.la -lm
++	libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.la -lm
  	- ./ccolamd_l_example > my_ccolamd_l_example.out
  	- diff ccolamd_example.out my_ccolamd_example.out
  
-diff -ur CCOLAMD/Lib/Makefile CCOLAMD-shared/Lib/Makefile
---- CCOLAMD/Lib/Makefile	2007-12-02 15:48:48.000000000 +0100
-+++ CCOLAMD-shared/Lib/Makefile	2007-12-02 15:47:12.000000000 +0100
+--- CCOLAMD/Lib/Makefile.orig	2012-01-01 15:02:59.719704930 +0100
++++ CCOLAMD/Lib/Makefile	2012-01-01 15:57:38.526481381 +0100
 @@ -2,7 +2,8 @@
  # CCOLAMD Makefile
  #-------------------------------------------------------------------------------
@@ -29,20 +28,20 @@
  
  include /usr/share/misc/UFconfig.mk
  
-@@ -13,15 +14,20 @@
+@@ -13,16 +14,19 @@
  SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c
  
  # creates libccolamd.a, a C-callable COLAMD library
 -libccolamd.a:  $(SRC) $(INC)
--	$(CC) $(CFLAGS) $(I) -c ../Source/ccolamd_global.c
--	$(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c
--	$(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o
--	$(AR) libccolamd.a ccolamd.o ccolamd_l.o ccolamd_global.o
-+libccolamd.a: libccolamd.la
+-	$(CC) $(CF) $(I) -c ../Source/ccolamd_global.c
+-	$(CC) $(CF) $(I) -c ../Source/ccolamd.c
+-	$(CC) $(CF) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o
+-	$(ARCHIVE)  libccolamd.a ccolamd.o ccolamd_l.o ccolamd_global.o
+-	- $(RANLIB) libccolamd.a 
 +libccolamd.la:  $(SRC) $(INC)
-+	libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd_global.c
-+	libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c
-+	libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.lo
++	libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/ccolamd_global.c
++	libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/ccolamd.c
++	libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o
 +	libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libccolamd.la -rpath $(libdir) ccolamd.lo ccolamd_l.lo ccolamd_global.lo -lm
 +
 +install: libccolamd.la
@@ -57,7 +56,7 @@
  
  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/CCOLAMD/CCOLAMD.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CCOLAMD/ccolamd-shared.patch?r1=1.4&r2=1.5&f=u