- updated to 2.7.4

- updated shared patch

Changed files:
    CCOLAMD.spec -> 1.13
    ccolamd-shared.patch -> 1.5

diff --git a/CCOLAMD.spec b/CCOLAMD.spec
index 35c0a2119ab1bb39cb0de77036617e0f0e3f9127..a9dba2d1ca7e223d5bc57d15971c2cd1d9faa105 100644 (file)
--- a/CCOLAMD.spec
+++ b/CCOLAMD.spec
@@ -1,16 +1,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)
 
@@ -39,7 +39,7 @@ Summary:      Header files for CCOLAMD library
 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.

diff --git a/ccolamd-shared.patch b/ccolamd-shared.patch
index d0ace0421f898971a1ee2567ec4230e55adcbeef..4f8ff1e192eccca94b3480277cdf5e0b3ec2e262 100644 (file)
--- a/ccolamd-shared.patch
+++ b/ccolamd-shared.patch
@@ -6,19 +6,18 @@ diff -ur CCOLAMD/Demo/Makefile CCOLAMD-shared/Demo/Makefile
  
  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 @@ diff -ur CCOLAMD/Lib/Makefile CCOLAMD-shared/Lib/Makefile
  
  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 @@ diff -ur CCOLAMD/Lib/Makefile CCOLAMD-shared/Lib/Makefile
  
  clean:
        - $(RM) $(CLEAN)
-@@ -29,4 +35,4 @@
+@@ -30,4 +34,4 @@
  purge: distclean
  
  distclean: clean