- updated to 2.8.0; switched to SuiteSparse_config

- updated ufconfig,shared patches

Changed files:
    COLAMD.spec -> 1.19
    colamd-shared.patch -> 1.7
    colamd-ufconfig.patch -> 1.5

diff --git a/COLAMD.spec b/COLAMD.spec
index d104e013af9f36a0a95b08b9ab12d376f35980ed..5232a583ab78d4c8eba026894eae46d7273c7b5a 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.4
+Version:       2.8.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/colamd/%{name}-%{version}.tar.gz
-# Source0-md5: 186d692ab7211e79f9b727d8192635f7
+# Source0-md5: 482dc4f958c2dafdd430d4c3148d15c5
 Patch0:                colamd-ufconfig.patch
 Patch1:                colamd-shared.patch
 URL:           http://www.cise.ufl.edu/research/sparse/colamd/
-BuildRequires: UFconfig >= 3.7.0
+BuildRequires: SuiteSparse_config >= 4.0.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 >= 3.7.0
+Requires:      SuiteSparse_config >= 4.0.0
 Obsoletes:     colamd-devel
 
 %description devel

diff --git a/colamd-shared.patch b/colamd-shared.patch
index 2ffcdc30b9cc889c1932f328b0c2d35c60a5297f..6725e6103b9ca97735f35b33e83b61258f46f73a 100644 (file)
--- a/colamd-shared.patch
+++ b/colamd-shared.patch
@@ -26,7 +26,7 @@ diff -ur COLAMD/Demo/Makefile COLAMD-shared/Demo/Makefile
 +default: libcolamd.la
 +libdir        := /usr/lib
  
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
  
 @@ -13,16 +14,19 @@
  SRC = ../Source/colamd.c ../Source/colamd_global.c

diff --git a/colamd-ufconfig.patch b/colamd-ufconfig.patch
index acc98e41ba57423cb142836b1394ae6afb0bb63e..faa98521a7b38c7340ec97939414957ac9c1d98f 100644 (file)
--- a/colamd-ufconfig.patch
+++ b/colamd-ufconfig.patch
@@ -1,44 +1,22 @@
---- COLAMD/Source/colamd.c~    2006-12-13 13:46:38.000000000 +0200
-+++ COLAMD/Source/colamd.c     2007-03-27 01:17:49.118259378 +0300
-@@ -685,7 +685,7 @@
+--- COLAMD/Include/colamd.h.orig       2012-05-29 17:03:28.000000000 +0200
++++ COLAMD/Include/colamd.h    2012-06-27 17:10:19.412091279 +0200
+@@ -135,7 +135,7 @@
+ /* === Prototypes of user-callable routines ================================= */
  /* ========================================================================== */
  
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- #ifdef DLONG
- 
---- COLAMD/Include/colamd.h~   2006-12-13 13:46:09.000000000 +0200
-+++ COLAMD/Include/colamd.h    2007-03-27 01:18:06.598650636 +0300
-@@ -139,7 +139,7 @@
- /* ========================================================================== */
- 
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
  
  size_t colamd_recommended     /* returns recommended value of Alen, */
                                /* or 0 if input arguments are erroneous */
---- COLAMD/Demo/colamd_l_example.c~    2006-12-13 13:47:22.000000000 +0200
-+++ COLAMD/Demo/colamd_l_example.c     2007-03-27 01:18:17.698899095 +0300
-@@ -44,7 +44,7 @@
- #define B_N 5
- 
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- int main (void)
- {
 --- COLAMD/Makefile~   2007-03-27 01:18:43.219470348 +0300
 +++ COLAMD/Makefile    2007-03-27 01:18:44.569500568 +0300
 @@ -1,7 +1,7 @@
  
  default: demo
  
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  # Compile all C code, including the C-callable routine and the mexFunctions.
  # Do not the MATLAB interface.
@@ -49,10 +27,10 @@ diff -ur COLAMD/Demo/Makefile COLAMD.UF/Demo/Makefile
  
  default: colamd_example colamd_l_example
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--I = -I../Include -I../../UFconfig
+-I = -I../Include -I../../SuiteSparse_config
 +I = -I../Include
  
  C = $(CC) $(CFLAGS) $(I)
@@ -64,31 +42,13 @@ diff -ur COLAMD/Lib/Makefile COLAMD.UF/Lib/Makefile
  
  default: libcolamd.a
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
- 
--I = -I../Include -I../../UFconfig
-+I = -I../Include
- 
--INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
-+INC = ../Include/colamd.h
- 
- SRC = ../Source/colamd.c ../Source/colamd_global.c
- 
-diff -ur COLAMD/MATLAB/Makefile COLAMD.UF/MATLAB/Makefile
---- COLAMD/MATLAB/Makefile     2007-05-06 04:41:53.000000000 +0200
-+++ COLAMD.UF/MATLAB/Makefile  2007-12-02 15:42:15.000000000 +0100
-@@ -2,11 +2,11 @@
- 
- default: colamd2 symamd2
- 
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--I = -I../../UFconfig -I../Include
+-I = -I../Include -I../../SuiteSparse_config
 +I = -I../Include
  
--INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
+-INC = ../Include/colamd.h ../../SuiteSparse_config/SuiteSparse_config.h
 +INC = ../Include/colamd.h
  
  SRC = ../Source/colamd.c ../Source/colamd_global.c