packages: COLAMD/COLAMD.spec, COLAMD/colamd-shared.patch, COLAMD/colamd-ufc...

qboosh qboosh at pld-linux.org
Wed Jun 27 17:11:42 CEST 2012 

Author: qboosh                       Date: Wed Jun 27 15:11:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.8.0; switched to SuiteSparse_config
- updated ufconfig,shared patches

---- Files affected:
packages/COLAMD:
   COLAMD.spec (1.18 -> 1.19) , colamd-shared.patch (1.6 -> 1.7) , colamd-ufconfig.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/COLAMD/COLAMD.spec
diff -u packages/COLAMD/COLAMD.spec:1.18 packages/COLAMD/COLAMD.spec:1.19
--- packages/COLAMD/COLAMD.spec:1.18	Sun Jan  1 15:00:04 2012
+++ packages/COLAMD/COLAMD.spec	Wed Jun 27 17:11:36 2012
@@ -2,16 +2,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)
@@ -45,7 +45,7 @@
 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
@@ -117,6 +117,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2012/06/27 15:11:36  qboosh
+- updated to 2.8.0; switched to SuiteSparse_config
+- updated ufconfig,shared patches
+
 Revision 1.18  2012/01/01 14:00:04  qboosh
 - updated to 2.7.4
 - updated shared patch

================================================================
Index: packages/COLAMD/colamd-shared.patch
diff -u packages/COLAMD/colamd-shared.patch:1.6 packages/COLAMD/colamd-shared.patch:1.7
--- packages/COLAMD/colamd-shared.patch:1.6	Sun Jan  1 15:00:04 2012
+++ packages/COLAMD/colamd-shared.patch	Wed Jun 27 17:11:36 2012
@@ -26,7 +26,7 @@
 +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

================================================================
Index: packages/COLAMD/colamd-ufconfig.patch
diff -u packages/COLAMD/colamd-ufconfig.patch:1.4 packages/COLAMD/colamd-ufconfig.patch:1.5
--- packages/COLAMD/colamd-ufconfig.patch:1.4	Sun Dec  2 15:48:34 2007
+++ packages/COLAMD/colamd-ufconfig.patch	Wed Jun 27 17:11:36 2012
@@ -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 @@
  
  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 @@
  
  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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/COLAMD/COLAMD.spec?r1=1.18&r2=1.19
    http://cvs.pld-linux.org/packages/COLAMD/colamd-shared.patch?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/packages/COLAMD/colamd-ufconfig.patch?r1=1.4&r2=1.5

More information about the pld-cvs-commit mailing list