packages/AMD branch master updated.
draenog
draenog at pld-linux.org
Wed Jul 4 13:17:31 CEST 2012
The branch, master has been updated
via 52e53b916a0e8204e86510820543918102db00d0 (commit)
from 4cae599c4f941840fd784cbf6bf65398c8af2721 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 52e53b916a0e8204e86510820543918102db00d0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jun 27 13:56:54 2012 +0000
- updated to 2.3.0; switched to SuiteSparse_config
- updated ufconfig,shared patches
Changed files:
AMD.spec -> 1.22
amd-shared.patch -> 1.6
amd-ufconfig.patch -> 1.3
diff --git a/AMD.spec b/AMD.spec
index da2f629..2cfed6a 100644
--- a/AMD.spec
+++ b/AMD.spec
@@ -1,16 +1,16 @@
Summary: AMD: Approximate Minimum Degree
Summary(pl.UTF-8): AMD - przybliżony algorytm minimalnego stopnia
Name: AMD
-Version: 2.2.4
+Version: 2.3.0
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://www.cise.ufl.edu/research/sparse/amd/%{name}-%{version}.tar.gz
-# Source0-md5: 31943ff81859eb42d695d8a34d5b4201
+# Source0-md5: 76f2a8a94d1ea071b622e07a0ee2de47
Patch0: amd-ufconfig.patch
Patch1: amd-shared.patch
URL: http://www.cise.ufl.edu/research/sparse/amd/
-BuildRequires: UFconfig >= 3.7.0
+BuildRequires: SuiteSparse_config >= 4.0.0
BuildRequires: libtool >= 2:1.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,7 +33,7 @@ Summary: Header files for AMD library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki AMD
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: UFconfig >= 3.7.0
+Requires: SuiteSparse_config >= 4.0.0
%description devel
Header files for AMD library.
diff --git a/amd-shared.patch b/amd-shared.patch
index 343917e..1e05ee0 100644
--- a/amd-shared.patch
+++ b/amd-shared.patch
@@ -66,7 +66,7 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
-default: libamd.a
+default: libamd.la
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
@@ -29,39 +29,41 @@
#-------------------------------------------------------------------------------
diff --git a/amd-ufconfig.patch b/amd-ufconfig.patch
index f91da36..cc8b75c 100644
--- a/amd-ufconfig.patch
+++ b/amd-ufconfig.patch
@@ -1,147 +1,88 @@
-diff -ur AMD/Demo/amd_l_demo.c AMD-uf/Demo/amd_l_demo.c
---- AMD/Demo/amd_l_demo.c 2007-05-03 17:16:55.000000000 +0200
-+++ AMD-uf/Demo/amd_l_demo.c 2007-12-02 18:02:54.000000000 +0100
-@@ -16,7 +16,7 @@
- #include "amd.h"
- #include <stdio.h>
- #include <stdlib.h>
--#include "UFconfig.h"
-+#include <UFconfig.h>
-
- int main (void)
- {
---- AMD/Demo/Makefile.orig 2011-12-08 17:09:28.000000000 +0100
-+++ AMD/Demo/Makefile 2012-01-01 12:05:32.912681767 +0100
+--- AMD/Demo/Makefile.orig 2012-05-27 01:13:34.000000000 +0200
++++ AMD/Demo/Makefile 2012-06-27 15:15:08.539047966 +0200
@@ -4,11 +4,11 @@
default: amd_simple amd_demo amd_demo2 amd_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
--INC = ../Include/amd.h ../../UFconfig/UFconfig.h
+-INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
+INC = ../Include/amd.h
library:
( cd ../Lib ; $(MAKE) )
-diff -ur AMD/Doc/Makefile AMD-uf/Doc/Makefile
---- AMD/Doc/Makefile 2006-04-25 18:34:27.000000000 +0200
-+++ AMD-uf/Doc/Makefile 2007-12-02 18:01:59.000000000 +0100
+--- AMD/Doc/Makefile.orig 2012-05-28 02:24:04.000000000 +0200
++++ AMD/Doc/Makefile 2012-06-27 15:15:47.109046348 +0200
@@ -4,7 +4,7 @@
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 AMD/Include/amd.h AMD-uf/Include/amd.h
---- AMD/Include/amd.h 2007-05-04 17:11:54.000000000 +0200
-+++ AMD-uf/Include/amd.h 2007-12-02 18:03:19.000000000 +0100
-@@ -45,7 +45,7 @@
+--- AMD/Include/amd.h.orig 2012-05-29 18:42:50.000000000 +0200
++++ AMD/Include/amd.h 2012-06-27 15:12:34.369054437 +0200
+@@ -43,7 +43,7 @@
+ /* get the definition of size_t: */
#include <stddef.h>
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
- int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
- * AMD_INVALID, or AMD_OUT_OF_MEMORY */
-diff -ur AMD/Include/amd_internal.h AMD-uf/Include/amd_internal.h
---- AMD/Include/amd_internal.h 2007-05-03 17:26:14.000000000 +0200
-+++ AMD-uf/Include/amd_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)
-
---- AMD/Lib/Makefile.orig 2011-12-08 18:36:01.000000000 +0100
-+++ AMD/Lib/Makefile 2012-01-01 12:08:08.002686960 +0100
+ int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
+ * AMD_INVALID, or AMD_OUT_OF_MEMORY */
+--- AMD/Lib/Makefile.orig 2012-05-27 01:19:39.000000000 +0200
++++ AMD/Lib/Makefile 2012-06-27 15:16:07.689045486 +0200
@@ -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:
$(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o
-diff -ur AMD/Makefile AMD-uf/Makefile
---- AMD/Makefile 2007-05-05 19:23:47.000000000 +0200
-+++ AMD-uf/Makefile 2007-12-02 18:02:33.000000000 +0100
-@@ -4,7 +4,7 @@
-
- default: demo
-
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+--- AMD/Makefile.orig 2012-05-28 22:30:07.000000000 +0200
++++ AMD/Makefile 2012-06-27 15:16:34.285711036 +0200
+@@ -6,7 +6,7 @@
- # Compile all C code, including the C-callable routines.
- # Do not compile the FORTRAN versions, or MATLAB interface.
-diff -ur AMD/MATLAB/amd_mex.c AMD-uf/MATLAB/amd_mex.c
---- AMD/MATLAB/amd_mex.c 2007-05-03 17:22:16.000000000 +0200
-+++ AMD-uf/MATLAB/amd_mex.c 2007-12-02 18:03:32.000000000 +0100
-@@ -30,7 +30,7 @@
- #include "amd.h"
- #include "mex.h"
- #include "matrix.h"
--#include "UFconfig.h"
-+#include <UFconfig.h>
+ default: all
- void mexFunction
- (
-diff -ur AMD/MATLAB/Makefile AMD-uf/MATLAB/Makefile
---- AMD/MATLAB/Makefile 2007-05-03 16:02:45.000000000 +0200
-+++ AMD-uf/MATLAB/Makefile 2007-12-02 18:02:24.000000000 +0100
-@@ -4,13 +4,13 @@
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
- default: amd2
-
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
-
- AMD = ../Lib/libamd.a
-
--I = -I../Include -I../../UFconfig
-+I = -I../Include
-
--INC = ../Include/amd.h ../Include/amd_internal.h ../../UFconfig/UFconfig.h
-+INC = ../Include/amd.h ../Include/amd_internal.h
+ demos: all
- SRC = ../Source/amd_1.c ../Source/amd_2.c ../Source/amd_aat.c \
- ../Source/amd_control.c ../Source/amd_defaults.c ../Source/amd_dump.c \
---- AMD/Lib/GNUmakefile.orig 2011-12-08 18:35:33.000000000 +0100
-+++ AMD/Lib/GNUmakefile 2012-01-01 12:07:45.906019555 +0100
+--- AMD/Lib/GNUmakefile.orig 2012-05-29 23:56:26.000000000 +0200
++++ AMD/Lib/GNUmakefile 2012-06-27 15:20:21.892368141 +0200
@@ -4,9 +4,9 @@
default: libamd.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,9 +15,7 @@
AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
amd_order amd_control amd_info amd_valid amd_preprocess
--UFCONFIG = ../../UFconfig/UFconfig.h
+-CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h
-
--INC = ../Include/amd.h ../Include/amd_internal.h $(UFCONFIG)
+-INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG)
+INC = ../Include/amd.h ../Include/amd_internal.h
#-------------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
AMD.spec | 8 ++--
amd-shared.patch | 2 +-
amd-ufconfig.patch | 135 +++++++++++++++--------------------------------------
3 files changed, 43 insertions(+), 102 deletions(-)
hooks/post-receive
--
packages/AMD
More information about the test
mailing list