packages: CAMD/CAMD-shared.patch, CAMD/CAMD-ufconfig.patch, CAMD/CAMD.spec ...

qboosh qboosh at pld-linux.org
Wed Jun 27 17:06:16 CEST 2012 

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

---- Files affected:
packages/CAMD:
   CAMD-shared.patch (1.4 -> 1.5) , CAMD-ufconfig.patch (1.2 -> 1.3) , CAMD.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/CAMD/CAMD-shared.patch
diff -u packages/CAMD/CAMD-shared.patch:1.4 packages/CAMD/CAMD-shared.patch:1.5
--- packages/CAMD/CAMD-shared.patch:1.4	Sun Jan  1 14:03:41 2012
+++ packages/CAMD/CAMD-shared.patch	Wed Jun 27 17:06:11 2012
@@ -37,7 +37,7 @@
 -default: libcamd.a
 +default: libcamd.la
  
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
  
 @@ -29,21 +29,24 @@
  #-------------------------------------------------------------------------------

================================================================
Index: packages/CAMD/CAMD-ufconfig.patch
diff -u packages/CAMD/CAMD-ufconfig.patch:1.2 packages/CAMD/CAMD-ufconfig.patch:1.3
--- packages/CAMD/CAMD-ufconfig.patch:1.2	Sun Jan  1 14:03:41 2012
+++ packages/CAMD/CAMD-ufconfig.patch	Wed Jun 27 17:06:11 2012
@@ -1,31 +1,16 @@
-diff -ur CAMD/Demo/camd_l_demo.c CAMD-uf/Demo/camd_l_demo.c
---- CAMD/Demo/camd_l_demo.c	2007-05-03 17:16:55.000000000 +0200
-+++ CAMD-uf/Demo/camd_l_demo.c	2007-12-02 18:02:54.000000000 +0100
-@@ -16,7 +16,7 @@
- #include <stdlib.h>
- 
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- int main (void)
- {
---- CAMD/Demo/Makefile.orig	2011-12-08 17:12:27.000000000 +0100
-+++ CAMD/Demo/Makefile	2012-01-01 13:52:29.406229949 +0100
-@@ -4,13 +4,13 @@
+--- CAMD/Demo/Makefile.orig	2012-05-27 01:23:01.000000000 +0200
++++ CAMD/Demo/Makefile	2012-06-27 16:48:20.148813310 +0200
+@@ -4,11 +4,11 @@
  
  default: camd_simple camd_demo camd_demo2 camd_l_demo
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--C = $(CC) $(CF) -I../Include -I../../UFconfig
+-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 +C = $(CC) $(CF) -I../Include
  
--UFCONFIG = ../../UFconfig/UFconfig.h
-+UFCONFIG = /usr/share/misc/UFconfig.mk
- 
--INC = ../Include/camd.h $(UFCONFIG)
+-INC = ../Include/camd.h ../../SuiteSparse_config/SuiteSparse_config.h
 +INC = ../Include/camd.h
  
  library:
@@ -37,45 +22,32 @@
  
  default: dist
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  #------------------------------------------------------------------------------
  # Remove all but the files in the original distribution
-diff -ur CAMD/Include/camd.h CAMD-uf/Include/camd.h
---- CAMD/Include/camd.h	2007-05-04 17:11:54.000000000 +0200
-+++ CAMD-uf/Include/camd.h	2007-12-02 18:03:19.000000000 +0100
-@@ -45,7 +45,7 @@
+--- CAMD/Include/camd.h.orig	2012-05-29 18:43:27.000000000 +0200
++++ CAMD/Include/camd.h	2012-06-27 16:22:56.608877247 +0200
+@@ -31,7 +31,7 @@
+ /* get the definition of size_t: */
  #include <stddef.h>
  
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- int amd_order		    /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
- 			     * AMD_INVALID, or AMD_OUT_OF_MEMORY */
-diff -ur CAMD/Include/camd_internal.h CAMD-uf/Include/camd_internal.h
---- CAMD/Include/camd_internal.h	2007-05-03 17:26:14.000000000 +0200
-+++ CAMD-uf/Include/camd_internal.h	2007-12-02 18:03:11.000000000 +0100
-@@ -162,7 +162,7 @@
- /* ------------------------------------------------------------------------- */
- 
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- #if defined (DLONG) || defined (ZLONG)
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
  
+ int camd_order              /* returns CAMD_OK, CAMD_OK_BUT_JUMBLED,
+                              * CAMD_INVALID, or CAMD_OUT_OF_MEMORY */
 --- CAMD/Lib/Makefile.orig	2011-12-08 18:36:42.000000000 +0100
 +++ CAMD/Lib/Makefile	2012-01-01 13:52:49.706230628 +0100
 @@ -8,9 +8,9 @@
  
  default: everything
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--C = $(CC) $(CF) -I../Include -I../../UFconfig
+-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 +C = $(CC) $(CF) -I../Include
  
  everything:
@@ -87,64 +59,31 @@
  
  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 routines.
  # Do not compile the FORTRAN versions, or MATLAB interface.
-diff -ur CAMD/MATLAB/camd_mex.c CAMD-uf/MATLAB/camd_mex.c
---- CAMD/MATLAB/camd_mex.c	2007-05-03 17:22:16.000000000 +0200
-+++ CAMD-uf/MATLAB/camd_mex.c	2007-12-02 18:03:32.000000000 +0100
-@@ -30,7 +30,7 @@
- #include "camd.h"
- #include "mex.h"
- #include "matrix.h"
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- void mexFunction
- (
-diff -ur CAMD/MATLAB/Makefile CAMD-uf/MATLAB/Makefile
---- CAMD/MATLAB/Makefile	2007-05-03 16:02:45.000000000 +0200
-+++ CAMD-uf/MATLAB/Makefile	2007-12-02 18:02:24.000000000 +0100
-@@ -4,13 +4,13 @@
- 
- default: amd2
- 
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
- 
- CAMD = ../Lib/libcamd.a
- 
--I = -I../Include -I../../UFconfig
-+I = -I../Include
- 
--INC = ../Include/camd.h ../Include/camd_internal.h ../../UFconfig/UFconfig.h
-+INC = ../Include/camd.h ../Include/camd_internal.h
- 
- SRC = ../Source/camd_1.c ../Source/camd_2.c ../Source/camd_aat.c \
-     ../Source/camd_control.c ../Source/camd_defaults.c ../Source/camd_dump.c \
---- CAMD/Lib/GNUmakefile.orig	2011-12-08 18:36:27.000000000 +0100
-+++ CAMD/Lib/GNUmakefile	2012-01-01 13:53:05.949564506 +0100
+--- CAMD/Lib/GNUmakefile.orig	2012-05-27 01:26:47.000000000 +0200
++++ CAMD/Lib/GNUmakefile	2012-06-27 16:48:35.802145990 +0200
 @@ -4,9 +4,9 @@
  
  default: libcamd.a
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--C = $(CC) $(CF) -I../Include -I../../UFconfig
+-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 +C = $(CC) $(CF) -I../Include
  
  #-------------------------------------------------------------------------------
  # source files
-@@ -15,9 +15,7 @@ C = $(CC) $(CF) -I../Include -I../../UFc
+@@ -15,8 +15,7 @@
  CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \
  	camd_order camd_control camd_info camd_valid camd_preprocess
  
--UFCONFIG = ../../UFconfig/UFconfig.h
--
--INC = ../Include/camd.h ../Include/camd_internal.h $(UFCONFIG)
+-INC = ../Include/camd.h ../Include/camd_internal.h \
+-      ../../SuiteSparse_config/SuiteSparse_config.h
 +INC = ../Include/camd.h ../Include/camd_internal.h
  
  #-------------------------------------------------------------------------------

================================================================
Index: packages/CAMD/CAMD.spec
diff -u packages/CAMD/CAMD.spec:1.15 packages/CAMD/CAMD.spec:1.16
--- packages/CAMD/CAMD.spec:1.15	Fri May 25 15:11:21 2012
+++ packages/CAMD/CAMD.spec	Wed Jun 27 17:06:11 2012
@@ -2,16 +2,16 @@
 Summary:	CAMD: Constrainted Approximate Minimum Degree
 Summary(pl.UTF-8):	CAMD - przybliżony ograniczony algorytm minimalnego stopnia
 Name:		CAMD
-Version:	2.2.4
+Version:	2.3.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.cise.ufl.edu/research/sparse/camd/%{name}-%{version}.tar.gz
-# Source0-md5:	931547ea9692577f9fced7184b278f32
+# Source0-md5:	8a744defceccff63efa5e403296f6001
 Patch0:		%{name}-ufconfig.patch
 Patch1:		%{name}-shared.patch
 URL:		http://www.cise.ufl.edu/research/sparse/camd/
-BuildRequires:	UFconfig >= 3.7.0
+BuildRequires:	SuiteSparse_config >= 4.0.0
 BuildRequires:	libtool >= 2:1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,7 +29,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki CAMD
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	UFconfig >= 3.7.0
+Requires:	SuiteSparse_config >= 4.0.0
 
 %description devel
 Header files for CAMD library.
@@ -100,6 +100,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2012/06/27 15:06:11  qboosh
+- updated to 2.3.0; switched to SuiteSparse_config
+- updated ufconfig,shared patches
+
 Revision 1.15  2012/05/25 13:11:21  qboosh
 - updated to 2.2.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/CAMD/CAMD-shared.patch?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/CAMD/CAMD-ufconfig.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/CAMD/CAMD.spec?r1=1.15&r2=1.16

More information about the pld-cvs-commit mailing list