- updated to 5.6.1

- updated ufconfig,shared patches

diff --git a/UMFPACK-shared.patch b/UMFPACK-shared.patch
index f6c535ec64d0303b408c59d4b044c2e145b42a10..4c2cd6cb3f16a8a879a209f24221e0a5d797ee4e 100644 (file)
--- a/UMFPACK-shared.patch
+++ b/UMFPACK-shared.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- UMFPACK/Demo/Makefile.orig 2012-08-28 20:34:44.256987195 +0200
++++ UMFPACK/Demo/Makefile      2012-08-28 20:35:27.766986287 +0200
+@@ -48,10 +48,10 @@
  
  LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
  
@@ -8,36 +8,12 @@
 +../Lib/libumfpack.la:
        ( cd ../Lib ; $(MAKE) )
  
--../../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 )
--
--../../COLAMD/Lib/libcolamd.a:
--      - ( cd ../../COLAMD && $(MAKE) library )
--
--
--../../CCOLAMD/Lib/libccolamd.a:
--      - ( cd ../../CCOLAMD && $(MAKE) library )
--
--../../CAMD/Lib/libcamd.a:
--      - ( cd ../../CAMD && $(MAKE) library )
--
--$(METIS):
--      ( cd $(METIS_PATH) && $(MAKE) )
--
--UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
--    ../../SuiteSparse_config/libsuitesparseconfig.a \
--    $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
-+UMFPACK = ../Lib/libumfpack.la
- 
- libs: $(UMFPACK)
- 
-@@ -86,7 +62,7 @@
+-UMFPACK = ../Lib/libumfpack.a -lamd \
++UMFPACK = ../Lib/libumfpack.la -lamd \
+     -lsuitesparseconfig \
+     $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
+ 
+@@ -64,7 +64,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)
@@ -46,7 +22,7 @@
  
  # the GNU rules are simpler:
  # umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed
-@@ -103,28 +79,28 @@
+@@ -81,28 +81,28 @@
        - sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c
  
  umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK)
@@ -79,7 +55,7 @@
  
  run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple
        ./umfpack_simple
-@@ -166,16 +142,16 @@
+@@ -144,16 +144,16 @@
        - ./umf4 a 1e-6
  
  umf4: umf4.c $(UMFPACK)
@@ -100,7 +76,7 @@
  
  #-------------------------------------------------------------------------------
  # compile the FORTRAN interface and demo
-@@ -183,17 +159,17 @@
+@@ -161,17 +161,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)

diff --git a/UMFPACK-ufconfig.patch b/UMFPACK-ufconfig.patch
index ec6cdadd9bb934ae4e775b642a4bbce8e384097b..275a792628ba81173bdf60143506e699836746ee 100644 (file)
--- a/UMFPACK-ufconfig.patch
+++ b/UMFPACK-ufconfig.patch
@@ -1,5 +1,5 @@
---- UMFPACK/Demo/Makefile.orig 2011-12-14 18:45:15.000000000 +0100
-+++ UMFPACK/Demo/Makefile      2012-01-06 08:03:34.253327243 +0100
+--- UMFPACK/Demo/Makefile.orig 2012-06-21 07:39:46.000000000 +0200
++++ UMFPACK/Demo/Makefile      2012-08-28 20:34:10.400321229 +0200
 @@ -13,7 +13,7 @@
  
  all64: libs run hb fortran64
@@ -9,34 +9,41 @@
  
  #-------------------------------------------------------------------------------
  # the optional Partition module requires METIS, CAMD, and CCOLAMD
-@@ -23,35 +23,28 @@
- LIB_WITH_CHOLMOD =
+@@ -22,69 +22,37 @@
+ CONFIG1 = -DNCHOLMOD
+ CONFIG2 = -DNPARTITION
  ifeq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
-     # CHOLMOD is requested.  See if it is available
+-    # CHOLMOD is requested.  See if it is available
 -    ifeq (../../CHOLMOD, $(wildcard ../../CHOLMOD))
 -        ifeq (../../COLAMD, $(wildcard ../../COLAMD))
+-            # CHOLMOD and COLAMD are available
++    # CHOLMOD is requested.
 +    ifeq ($(WITH_CHOLMOD), 1)
-+        # assume COLAMD available
-             # CHOLMOD and COLAMD are available
++            # assume COLAMD available
              CONFIG1 =
 -            LIB_WITH_CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
 -                ../../COLAMD/Lib/libcolamd.a
 +            LIB_WITH_CHOLMOD = -lcholmod -lcolamd
              # check if METIS is requested and available
              ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
-                 # METIS is requested.  See if it is available
--                ifeq ($(METIS), $(wildcard $(METIS)))
+-                # METIS is requested.  See if it is available
+-                ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
 -                    ifeq (../../CAMD, $(wildcard ../../CAMD))
 -                        ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
-+                ifeq ($(WITH_METIS), 1)
-+                    # assume CAMD and CCOLAMD are available
-                             CONFIG2 =
+-                            # METIS, CAMD, and CCOLAMD are available
 -                            LIB_WITH_PARTITION = $(METIS) \
 -                                ../../CCOLAMD/Lib/libccolamd.a \
 -                                ../../CAMD/Lib/libcamd.a
+-                            I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
+-                                -I../../CCOLAMD/Include -I../../CAMD/Include
++                # METIS is requested.
++                ifeq ($(WITH_METIS), 1)
++                            LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd
++                            I_WITH_PARTITION = -I/usr/include/metis \
++                                -I/usr/include/ccolamd -I/usr/include/camd
+                             CONFIG2 =
 -                        endif
 -                    endif
-+                            LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
                  endif
              endif
 -        endif
@@ -53,6 +60,38 @@
  
  LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
  
+ ../Lib/libumfpack.a:
+       ( cd ../Lib ; $(MAKE) )
+ 
+-../../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 )
+-
+-../../COLAMD/Lib/libcolamd.a:
+-      - ( cd ../../COLAMD && $(MAKE) library )
+-
+-
+-../../CCOLAMD/Lib/libccolamd.a:
+-      - ( cd ../../CCOLAMD && $(MAKE) library )
+-
+-../../CAMD/Lib/libcamd.a:
+-      - ( cd ../../CAMD && $(MAKE) library )
+-
+-$(METIS):
+-      ( cd $(METIS_PATH) && $(MAKE) )
+-
+-UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
+-    ../../SuiteSparse_config/libsuitesparseconfig.a \
++UMFPACK = ../Lib/libumfpack.a -lamd \
++    -lsuitesparseconfig \
+     $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
+ 
+ libs: $(UMFPACK)
 diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
 --- UMFPACK/Doc/Makefile       2006-01-30 17:51:24.000000000 +0100
 +++ UMFPACK-uf/Doc/Makefile    2007-12-02 19:19:00.000000000 +0100

diff --git a/UMFPACK.spec b/UMFPACK.spec
index 74aaf052910a47670726cdda7a6a4360cb7cedaa..0082254612e1d62c247d28eb9cfb5335656fd5ce 100644 (file)
--- a/UMFPACK.spec
+++ b/UMFPACK.spec
@@ -1,12 +1,12 @@
 Summary:       UMFPACK: sparse multifrontal LU factorization
 Summary(pl.UTF-8):     UMFPACK - wielofrontalny rozkład LU macierzy rzadkich
 Name:          UMFPACK
-Version:       5.6.0
+Version:       5.6.1
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/umfpack/%{name}-%{version}.tar.gz
-# Source0-md5: 3455a9bc7ebe54001b33e66bcf9bbc7c
+# Source0-md5: 225faa6d0966ac0afaf17d6282f49edd
 Patch0:                %{name}-ufconfig.patch
 Patch1:                %{name}-shared.patch
 Patch2:                %{name}-include-AMD.patch