Author: qboosh Date: Wed Jun 27 18:33:33 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.6.0; switched to SuiteSparse_config
- updated ufconfig,shared patches
---- Files affected:
packages/UMFPACK:
UMFPACK-shared.patch (1.9 -> 1.10) , UMFPACK-ufconfig.patch (1.3 -> 1.4) ,
UMFPACK.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/UMFPACK/UMFPACK-shared.patch
diff -u packages/UMFPACK/UMFPACK-shared.patch:1.9
packages/UMFPACK/UMFPACK-shared.patch:1.10
--- packages/UMFPACK/UMFPACK-shared.patch:1.9 Fri Jan 6 10:15:03 2012
+++ packages/UMFPACK/UMFPACK-shared.patch Wed Jun 27 20:33:27 2012
@@ -1,6 +1,6 @@
---- UMFPACK/Demo/Makefile.orig 2012-01-06 09:13:28.333467677 +0100
-+++ UMFPACK/Demo/Makefile 2012-01-06 09:18:09.170143746 +0100
-@@ -48,30 +48,10 @@
+--- UMFPACK/Demo/Makefile.orig 2012-06-27 20:05:32.088316770 +0200
++++ UMFPACK/Demo/Makefile 2012-06-27 20:08:28.351642710 +0200
+@@ -48,34 +48,10 @@
LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
@@ -11,6 +11,9 @@
-../../AMD/Lib/libamd.a:
- ( cd ../../AMD ; $(MAKE) library )
-
+-../../SuiteSparse_config/libsuitesparseconfig.a:
+- ( cd ../../SuiteSparse_config ; $(MAKE) library )
+-
-../../CHOLMOD/Lib/libcholmod.a:
- - ( cd ../../CHOLMOD && $(MAKE) library )
-
@@ -28,12 +31,13 @@
- ( cd $(METIS_PATH) && $(MAKE) )
-
-UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
-- $(WITH_CHOLMOD) $(WITH_PARTITION)
+- ../../SuiteSparse_config/libsuitesparseconfig.a \
+- $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
+UMFPACK = ../Lib/libumfpack.la
libs: $(UMFPACK)
-@@ -82,7 +62,7 @@
+@@ -86,7 +62,7 @@
dist: umfpack_di_demo.c umfpack_dl_demo.c umfpack_zi_demo.c umfpack_zl_demo.c
umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK)
@@ -42,20 +46,20 @@
# the GNU rules are simpler:
# umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed
-@@ -99,28 +79,28 @@
+@@ -103,28 +79,28 @@
- sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c
umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_di_demo
umfpack_di_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o umfpack_di_demo
umfpack_di_demo.c $(UMFPACK) $(LIBS)
- # double-precision, UF_long verion:
+ # double-precision, SuiteSparse_long verion:
umfpack_dl_demo.c: umfpack_xx_demo.c umfpack_dl_demo.sed
- sed -f umfpack_dl_demo.sed < umfpack_xx_demo.c > umfpack_dl_demo.c
umfpack_dl_demo: umfpack_dl_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_dl_demo
umfpack_dl_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o umfpack_dl_demo
umfpack_dl_demo.c $(UMFPACK) $(LIBS)
# complex, int verion:
umfpack_zi_demo.c: umfpack_xx_demo.c umfpack_zi_demo.sed
@@ -63,19 +67,19 @@
umfpack_zi_demo: umfpack_zi_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_zi_demo
umfpack_zi_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o umfpack_zi_demo
umfpack_zi_demo.c $(UMFPACK) $(LIBS)
- # complex, UF_long verion:
+ # complex, SuiteSparse_long verion:
umfpack_zl_demo.c: umfpack_xx_demo.c umfpack_zl_demo.sed
- sed -f umfpack_zl_demo.sed < umfpack_xx_demo.c > umfpack_zl_demo.c
umfpack_zl_demo: umfpack_zl_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_zl_demo
umfpack_zl_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o umfpack_zl_demo
umfpack_zl_demo.c $(UMFPACK) $(LIBS)
run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo
umfpack_simple
./umfpack_simple
-@@ -162,16 +142,16 @@
+@@ -166,16 +142,16 @@
- ./umf4 a 1e-6
umf4: umf4.c $(UMFPACK)
@@ -96,7 +100,7 @@
#-------------------------------------------------------------------------------
# compile the FORTRAN interface and demo
-@@ -179,17 +159,17 @@
+@@ -183,17 +159,17 @@
# This doesn't seem to work on the Mac (Snow Leopard, OS X 10.6.1)
fortran: $(UMFPACK) umf4hb.f umf4_f77wrapper.o umf4zhb.f umf4_f77zwrapper.o
$(UMFPACK)
@@ -126,7 +130,7 @@
-default: libumfpack.a
+default: libumfpack.la
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
# UMFPACK can use CHOLMOD by default as an ordering option
ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
================================================================
Index: packages/UMFPACK/UMFPACK-ufconfig.patch
diff -u packages/UMFPACK/UMFPACK-ufconfig.patch:1.3
packages/UMFPACK/UMFPACK-ufconfig.patch:1.4
--- packages/UMFPACK/UMFPACK-ufconfig.patch:1.3 Fri Jan 6 10:15:03 2012
+++ packages/UMFPACK/UMFPACK-ufconfig.patch Wed Jun 27 20:33:27 2012
@@ -4,8 +4,8 @@
all64: libs run hb fortran64
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
#-------------------------------------------------------------------------------
# the optional Partition module requires METIS, CAMD, and CCOLAMD
@@ -45,10 +45,10 @@
#-------------------------------------------------------------------------------
C = $(CC) $(CF) $(UMFPACK_CONFIG) $(CONFIG1) $(CONFIG2) \
-- -I../Include -I../../AMD/Include -I../../UFconfig
+- -I../Include -I../../AMD/Include -I../../SuiteSparse_config
+ -I../Include -I/usr/include/amd
--INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h
+-INC = ../Include/umfpack.h ../../AMD/Include/amd.h
../../SuiteSparse_config/SuiteSparse_config.h
+INC = ../Include/umfpack.h
LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
@@ -60,37 +60,37 @@
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
---- UMFPACK/Lib/GNUmakefile.orig 2011-12-08 19:48:30.000000000 +0100
-+++ UMFPACK/Lib/GNUmakefile 2012-01-06 08:36:15.313392908 +0100
+--- UMFPACK/Lib/GNUmakefile.orig 2012-05-28 01:23:50.000000000 +0200
++++ UMFPACK/Lib/GNUmakefile 2012-06-27 20:04:57.011651575 +0200
@@ -4,14 +4,14 @@
default: libumfpack.a
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
# UMFPACK can use CHOLMOD by default as an ordering option
ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
-- I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig
+- I = -I../Include -I../Source -I../../AMD/Include
-I../../SuiteSparse_config
+ I = -I../Include -I../Source -I/usr/include/amd
else
-- I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig \
-- -I../../CHOLMOD/Include
+- I = -I../Include -I../Source -I../../AMD/Include \
+- -I../../SuiteSparse_config -I../../CHOLMOD/Include
+ I = -I../Include -I../Source -I/usr/include/amd \
+ -I/usr/include/cholmod
endif
C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
-@@ -72,7 +72,7 @@
+@@ -75,7 +75,7 @@
# include files:
#-------------------------------------------------------------------------------
--INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \
+-INC = ../Include/umfpack.h ../../SuiteSparse_config/SuiteSparse_config.h \
+INC = ../Include/umfpack.h \
../Source/umf_config.h ../Source/umf_version.h \
../Source/umf_internal.h ../Source/umf_triplet.h \
@@ -102,8 +102,8 @@
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) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
-I../Source
@@ -114,8 +114,8 @@
default: library
--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 (except hb, fortran, and fortran64), including AMD and
the
# MATLAB mexFunctions
@@ -125,8 +125,8 @@
default:
- echo "Use umfpack_make.m in MATLAB to compile the UMFPACK mexFunction"
--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
@@ -135,8 +135,8 @@
+++ UMFPACK-uf/Tcov/Makefile 2007-12-02 19:21:03.000000000 +0100
@@ -1,5 +1,5 @@
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
linux: distclean
./DO.linux
================================================================
Index: packages/UMFPACK/UMFPACK.spec
diff -u packages/UMFPACK/UMFPACK.spec:1.13 packages/UMFPACK/UMFPACK.spec:1.14
--- packages/UMFPACK/UMFPACK.spec:1.13 Thu Apr 19 21:46:07 2012
+++ packages/UMFPACK/UMFPACK.spec Wed Jun 27 20:33:27 2012
@@ -2,24 +2,29 @@
Summary: UMFPACK: sparse multifrontal LU factorization
Summary(pl.UTF-8): UMFPACK - wielofrontalny rozkład LU macierzy rzadkich
Name: UMFPACK
-Version: 5.5.2
-Release: 2
+Version: 5.6.0
+Release: 1
License: GPL v2+
Group: Libraries
Source0:
http://www.cise.ufl.edu/research/sparse/umfpack/%{name}-%{version}.tar.gz
-# Source0-md5: 07eaa6ae3de176e5b3681032c10c76be
+# Source0-md5: 3455a9bc7ebe54001b33e66bcf9bbc7c
Patch0: %{name}-ufconfig.patch
Patch1: %{name}-shared.patch
Patch2: %{name}-include-AMD.patch
URL: http://www.cise.ufl.edu/research/sparse/umfpack/
-BuildRequires: AMD-devel >= 2.2.3
-BuildRequires: CAMD-devel >= 2.2.3
-BuildRequires: CCOLAMD-devel >= 2.7.3
-BuildRequires: COLAMD-devel >= 2.7.3
-BuildRequires: CHOLMOD-devel >= 2.7.4
-BuildRequires: UFconfig >= 3.7.0
+BuildRequires: AMD-devel >= 2.3.0
+BuildRequires: CAMD-devel >= 2.3.0
+BuildRequires: CCOLAMD-devel >= 2.8.0
+BuildRequires: COLAMD-devel >= 2.8.0
+BuildRequires: CHOLMOD-devel >= 2.0.0
+BuildRequires: SuiteSparse_config >= 4.0.0
BuildRequires: blas-devel
BuildRequires: libtool >= 2:1.5
+Requires: AMD >= 2.3.0
+Requires: CAMD >= 2.3.0
+Requires: CCOLAMD >= 2.8.0
+Requires: COLAMD >= 2.8.0
+Requires: CHOLMOD >= 2.0.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -46,13 +51,12 @@
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki UMFPACK
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: AMD-devel >= 2.2.3
-Requires: CAMD-devel >= 2.2.3
-Requires: CCOLAMD-devel >= 2.7.3
-Requires: COLAMD-devel >= 2.7.3
-Requires: CHOLMOD-devel >= 2.7.4
-Requires: CHOLMOD-devel >= 2.7.4
-Requires: UFconfig >= 3.7.0
+Requires: AMD-devel >= 2.3.0
+Requires: CAMD-devel >= 2.3.0
+Requires: CCOLAMD-devel >= 2.8.0
+Requires: COLAMD-devel >= 2.8.0
+Requires: CHOLMOD-devel >= 2.0.0
+Requires: SuiteSparse_config >= 4.0.0
%description devel
Header files for UMFPACK library.
@@ -124,6 +128,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2012/06/27 18:33:27 qboosh
+- updated to 5.6.0; switched to SuiteSparse_config
+- updated ufconfig,shared patches
+
Revision 1.13 2012/04/19 19:46:07 wrobell
- fixed build dependencies
- fixed devel subpackage installation requirements
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/UMFPACK/UMFPACK-shared.patch?r1=1.9&r2=1.10
http://cvs.pld-linux.org/packages/UMFPACK/UMFPACK-ufconfig.patch?r1=1.3&r2=1.4
http://cvs.pld-linux.org/packages/UMFPACK/UMFPACK.spec?r1=1.13&r2=1.14
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
