- updated to 1.3.3

- updated shared patch

diff --git a/SPQR-shared.patch b/SPQR-shared.patch
index 9575a19976b8a0c92a23c8a01e286f5d29093c70..3aaf8eceb3b336ee69a331225fe2dc74421eb059 100644 (file)
--- a/SPQR-shared.patch
+++ b/SPQR-shared.patch
@@ -208,8 +208,8 @@
  spqr_rmap.o: ../Source/spqr_rmap.cpp
 -      $(C) -c $<
 +      libtool --tag=CXX --mode=compile $(C) -c $<
---- SPQR/Demo/Makefile.orig    2012-08-28 19:39:55.567055739 +0200
-+++ SPQR/Demo/Makefile 2012-08-28 19:40:51.427054575 +0200
+--- SPQR/Demo/Makefile.orig    2014-10-03 19:50:31.929096643 +0200
++++ SPQR/Demo/Makefile 2014-10-03 19:55:47.922416504 +0200
 @@ -25,7 +25,7 @@
  endif
  #-------------------------------------------------------------------------------
@@ -219,8 +219,48 @@
          -lsuitesparseconfig \
        -lcholmod -lamd \
        -lcolamd $(LIB_WITH_PARTITION)
-@@ -146,22 +146,22 @@
- LIBS = $(CLIB) $(LIB) $(FLIB) $(TBB)
+@@ -100,38 +100,11 @@
+       - $(V) ./qrdemoc < ../Matrix/Ragusa16.mtx
+       - $(V) ./qrdemoc < ../Matrix/young1c.mtx
+ 
+-../Lib/libspqr.a:
++../Lib/libspqr.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) )
+-
+ library:
+       ( cd ../Lib ; $(MAKE) )
+-      ( cd ../../AMD ; $(MAKE) library )
+-      ( cd ../../SuiteSparse_config ; $(MAKE) library )
+-      - ( cd ../../CHOLMOD && $(MAKE) library )
+-      - ( cd ../../COLAMD && $(MAKE) library )
+-      - ( cd ../../CCOLAMD && $(MAKE) library )
+-      - ( cd ../../CAMD && $(MAKE) library )
+ 
+ purge: distclean
+ 
+@@ -158,22 +131,22 @@
+ endif
  
  qrsimple: qrsimple.cpp library $(INC)
 -      $(C) qrsimple.cpp -o qrsimple $(LIBS)

diff --git a/SPQR.spec b/SPQR.spec
index cb4dae59feb94c85e837239c1e8f51a443e77d5e..6edd3481e62a009b19847ec476641ecec248cc07 100644 (file)
--- a/SPQR.spec
+++ b/SPQR.spec
@@ -1,12 +1,12 @@
 Summary:       SuiteSparseQR: multithreaded multifrontal sparse QR factorization
 Summary(pl.UTF-8):     SuiteSparseQR - wielowątkowy, wielofrontalny rozkład QR dla macierzy rzadkich
 Name:          SPQR
-Version:       1.3.1
+Version:       1.3.3
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/SPQR/%{name}-%{version}.tar.gz
-# Source0-md5: c1a55e7ac6208f7657186aa01356c8f2
+# Source0-md5: bdd05fa144f68fe318510888a89e9906
 Patch0:                %{name}-ufconfig.patch
 Patch1:                %{name}-shared.patch
 URL:           http://www.cise.ufl.edu/research/sparse/SPQR/