- updated to 2.7.4

- updated shared patch

Changed files:
    COLAMD.spec -> 1.18
    colamd-shared.patch -> 1.6

diff --git a/COLAMD.spec b/COLAMD.spec
index 30476c873337c7dd39de31198ede35d76e31ec89..d104e013af9f36a0a95b08b9ab12d376f35980ed 100644 (file)
--- a/COLAMD.spec
+++ b/COLAMD.spec
@@ -1,16 +1,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)
@@ -44,7 +44,7 @@ Summary:      Header files for COLAMD library
 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

diff --git a/colamd-shared.patch b/colamd-shared.patch
index dde804d782c216d253775942a7a0461c8daaea7a..2ffcdc30b9cc889c1932f328b0c2d35c60a5297f 100644 (file)
--- a/colamd-shared.patch
+++ b/colamd-shared.patch
@@ -6,19 +6,18 @@ diff -ur COLAMD/Demo/Makefile COLAMD-shared/Demo/Makefile
  
  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 @@ diff -ur COLAMD/Lib/Makefile COLAMD-shared/Lib/Makefile
  
  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