packages: CCOLAMD/CCOLAMD.spec, CCOLAMD/ccolamd-shared.patch, CCOLAMD/ccola...
qboosh
qboosh at pld-linux.org
Wed Jun 27 17:25:15 CEST 2012
Author: qboosh Date: Wed Jun 27 15:25:15 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.8.0; switched to SuiteSparse_config
- updated ufconfig,shared patches
---- Files affected:
packages/CCOLAMD:
CCOLAMD.spec (1.13 -> 1.14) , ccolamd-shared.patch (1.5 -> 1.6) , ccolamd-ufconfig.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/CCOLAMD/CCOLAMD.spec
diff -u packages/CCOLAMD/CCOLAMD.spec:1.13 packages/CCOLAMD/CCOLAMD.spec:1.14
--- packages/CCOLAMD/CCOLAMD.spec:1.13 Sun Jan 1 15:57:56 2012
+++ packages/CCOLAMD/CCOLAMD.spec Wed Jun 27 17:25:10 2012
@@ -2,16 +2,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)
@@ -40,7 +40,7 @@
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.
@@ -110,6 +110,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2012/06/27 15:25:10 qboosh
+- updated to 2.8.0; switched to SuiteSparse_config
+- updated ufconfig,shared patches
+
Revision 1.13 2012/01/01 14:57:56 qboosh
- updated to 2.7.4
- updated shared patch
================================================================
Index: packages/CCOLAMD/ccolamd-shared.patch
diff -u packages/CCOLAMD/ccolamd-shared.patch:1.5 packages/CCOLAMD/ccolamd-shared.patch:1.6
--- packages/CCOLAMD/ccolamd-shared.patch:1.5 Sun Jan 1 15:57:57 2012
+++ packages/CCOLAMD/ccolamd-shared.patch Wed Jun 27 17:25:10 2012
@@ -26,7 +26,7 @@
+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
================================================================
Index: packages/CCOLAMD/ccolamd-ufconfig.patch
diff -u packages/CCOLAMD/ccolamd-ufconfig.patch:1.1 packages/CCOLAMD/ccolamd-ufconfig.patch:1.2
--- packages/CCOLAMD/ccolamd-ufconfig.patch:1.1 Sun Dec 2 16:30:34 2007
+++ packages/CCOLAMD/ccolamd-ufconfig.patch Wed Jun 27 17:25:10 2012
@@ -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 @@
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 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/CCOLAMD/CCOLAMD.spec?r1=1.13&r2=1.14
http://cvs.pld-linux.org/packages/CCOLAMD/ccolamd-shared.patch?r1=1.5&r2=1.6
http://cvs.pld-linux.org/packages/CCOLAMD/ccolamd-ufconfig.patch?r1=1.1&r2=1.2
More information about the pld-cvs-commit
mailing list