- updated to 2.8.0; switched to SuiteSparse_config

- updated ufconfig,shared patches

Changed files:
    CCOLAMD.spec -> 1.14
    ccolamd-shared.patch -> 1.6
    ccolamd-ufconfig.patch -> 1.2

diff --git a/CCOLAMD.spec b/CCOLAMD.spec
index a9dba2d1ca7e223d5bc57d15971c2cd1d9faa105..083a5ba83624cd17a00d9f8b6287630ed0fb93df 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.4
+Version:       2.8.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/ccolamd/%{name}-%{version}.tar.gz
-# Source0-md5: bb55f6b4b9358160eaba1a57f863c65e
+# Source0-md5: a0af8b91c3d24eba5d4818e88c6c288c
 Patch0:                ccolamd-ufconfig.patch
 Patch1:                ccolamd-shared.patch
 URL:           http://www.cise.ufl.edu/research/sparse/ccolamd/
-BuildRequires: UFconfig >= 3.7.0
+BuildRequires: SuiteSparse_config >= 4.0.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 >= 3.7.0
+Requires:      SuiteSparse_config >= 4.0.0
 
 %description devel
 Header files for CCOLAMD library.

diff --git a/ccolamd-shared.patch b/ccolamd-shared.patch
index 4f8ff1e192eccca94b3480277cdf5e0b3ec2e262..60fc6b40ba1963ebaeede28ae63efb00fe0b9868 100644 (file)
--- a/ccolamd-shared.patch
+++ b/ccolamd-shared.patch
@@ -26,7 +26,7 @@ diff -ur CCOLAMD/Demo/Makefile CCOLAMD-shared/Demo/Makefile
 +default: libccolamd.la
 +libdir        := /usr/lib
  
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
  
 @@ -13,16 +14,19 @@
  SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c

diff --git a/ccolamd-ufconfig.patch b/ccolamd-ufconfig.patch
index 9e8932f5a2973579de2a44ec2bc54f8eef2fb21a..3d9775340c3fdfa01d676390740069817d518ec0 100644 (file)
--- a/ccolamd-ufconfig.patch
+++ b/ccolamd-ufconfig.patch
@@ -1,44 +1,22 @@
---- CCOLAMD/Source/ccolamd.c~  2006-12-13 13:46:38.000000000 +0200
-+++ CCOLAMD/Source/ccolamd.c   2007-03-27 01:17:49.118259378 +0300
-@@ -685,7 +685,7 @@
+--- CCOLAMD/Include/ccolamd.h.orig     2012-05-29 16:54:52.000000000 +0200
++++ CCOLAMD/Include/ccolamd.h  2012-06-27 17:14:53.668746441 +0200
+@@ -112,7 +112,7 @@
+ /* === Prototypes of user-callable routines ================================= */
  /* ========================================================================== */
  
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- #ifdef DLONG
- 
---- CCOLAMD/Include/ccolamd.h~ 2006-12-13 13:46:09.000000000 +0200
-+++ CCOLAMD/Include/ccolamd.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 ccolamd_recommended    /* returns recommended value of Alen, */
                                /* or 0 if input arguments are erroneous */
---- CCOLAMD/Demo/ccolamd_l_example.c~  2006-12-13 13:47:22.000000000 +0200
-+++ CCOLAMD/Demo/ccolamd_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)
- {
 --- CCOLAMD/Makefile~  2007-03-27 01:18:43.219470348 +0300
 +++ CCOLAMD/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 CCOLAMD/Demo/Makefile CCOLAMD.UF/Demo/Makefile
  
  default: ccolamd_example ccolamd_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 CCOLAMD/Lib/Makefile CCOLAMD.UF/Lib/Makefile
  
  default: libccolamd.a
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
- 
--I = -I../Include -I../../UFconfig
-+I = -I../Include
- 
--INC = ../Include/ccolamd.h ../../UFconfig/UFconfig.h
-+INC = ../Include/ccolamd.h
- 
- SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c
- 
-diff -ur CCOLAMD/MATLAB/Makefile CCOLAMD.UF/MATLAB/Makefile
---- CCOLAMD/MATLAB/Makefile    2007-05-06 04:41:53.000000000 +0200
-+++ CCOLAMD.UF/MATLAB/Makefile 2007-12-02 15:42:15.000000000 +0100
-@@ -2,11 +2,11 @@
- 
- default: ccolamd2 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/ccolamd.h ../../UFconfig/UFconfig.h
+-INC = ../Include/ccolamd.h ../../SuiteSparse_config/SuiteSparse_config.h
 +INC = ../Include/ccolamd.h
  
  SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c