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

qboosh qboosh at pld-linux.org
Wed Jun 27 19:16:38 CEST 2012 

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

---- Files affected:
packages/SPQR:
   SPQR-shared.patch (1.1 -> 1.2) , SPQR-ufconfig.patch (1.1 -> 1.2) , SPQR.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/SPQR/SPQR-shared.patch
diff -u packages/SPQR/SPQR-shared.patch:1.1 packages/SPQR/SPQR-shared.patch:1.2
--- packages/SPQR/SPQR-shared.patch:1.1	Sun Jan  8 12:56:38 2012
+++ packages/SPQR/SPQR-shared.patch	Wed Jun 27 19:16:33 2012
@@ -208,19 +208,19 @@
  spqr_rmap.o: ../Source/spqr_rmap.cpp
 -	$(C) -c $<
 +	libtool --tag=CXX --mode=compile $(C) -c $<
---- SPQR/Demo/Makefile.orig	2012-01-08 12:26:25.106307954 +0100
-+++ SPQR/Demo/Makefile	2012-01-08 12:36:06.779660766 +0100
-@@ -24,7 +24,7 @@
+--- SPQR/Demo/Makefile.orig	2012-06-27 19:01:18.418478492 +0200
++++ SPQR/Demo/Makefile	2012-06-27 19:01:37.301811034 +0200
+@@ -23,7 +23,7 @@
  endif
  #-------------------------------------------------------------------------------
  
 -CLIB = ../Lib/libspqr.a \
 +CLIB = ../Lib/libspqr.la \
- 	-lcholmod -lamd -lcolamd $(LIB_WITH_PARTITION) -lm
+ 	-lcholmod -lamd \
+ 	-lcolamd $(LIB_WITH_PARTITION)
  
- # use the BLAS and LAPACK defined by UFconfig.mk; do not use valgrind 
-@@ -120,22 +120,22 @@
- LIBS = $(CLIB) $(FLIB) $(TBB) $(RTLIB)
+@@ -140,22 +140,22 @@
+ LIBS = $(CLIB) $(LIB) $(FLIB) $(TBB)
  
  qrsimple: qrsimple.cpp library $(INC)
 -	$(C) qrsimple.cpp -o qrsimple $(LIBS)

================================================================
Index: packages/SPQR/SPQR-ufconfig.patch
diff -u packages/SPQR/SPQR-ufconfig.patch:1.1 packages/SPQR/SPQR-ufconfig.patch:1.2
--- packages/SPQR/SPQR-ufconfig.patch:1.1	Sun Jan  8 12:56:38 2012
+++ packages/SPQR/SPQR-ufconfig.patch	Wed Jun 27 19:16:33 2012
@@ -4,8 +4,8 @@
  
  VERSION = 1.2.3
  
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  default: all
  
@@ -15,8 +15,8 @@
  
  ccode: all
  
--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
@@ -40,32 +40,32 @@
  
  $(OBJ): $(INC)
  
--I = -I../../CHOLMOD/Include -I../../UFconfig -I../Include
+-I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include
 +I = -I/usr/include/cholmod -I../Include
  
  C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I)
  
---- SPQR/Demo/Makefile.orig	2011-12-14 18:48:48.000000000 +0100
-+++ SPQR/Demo/Makefile	2012-01-08 12:06:51.122935314 +0100
+--- SPQR/Demo/Makefile.orig	2012-05-28 15:15:40.000000000 +0200
++++ SPQR/Demo/Makefile	2012-06-27 19:00:41.468480043 +0200
 @@ -6,7 +6,7 @@
  
  ccode: all
  
--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
-@@ -15,23 +15,17 @@
+@@ -15,24 +15,17 @@
  # check if METIS is requested and available
  ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
      # METIS is requested.  See if it is available
 -    ifeq ($(METIS), $(wildcard $(METIS)))
 -        ifeq (../../CAMD, $(wildcard ../../CAMD))
 -            ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
+-                # METIS, CAMD, and CCOLAMD is available
 +    ifeq ($(WITH_METIS), 1)
-+	# assume CAMD and CCOLAMD are available
-                 # METIS, CAMD, and CCOLAMD is available
++                # assume that METIS, CAMD, and CCOLAMD are available
                  CONFIG =
 -                LIB_WITH_PARTITION = $(METIS) \
 -                    ../../CCOLAMD/Lib/libccolamd.a \
@@ -78,17 +78,19 @@
  #-------------------------------------------------------------------------------
  
  CLIB = ../Lib/libspqr.a \
+-        ../../SuiteSparse_config/libsuitesparseconfig.a \
 -	../../CHOLMOD/Lib/libcholmod.a ../../AMD/Lib/libamd.a \
--	../../COLAMD/Lib/libcolamd.a $(LIB_WITH_PARTITION) -lm
-+	-lcholmod -lamd -lcolamd $(LIB_WITH_PARTITION) -lm
+-	../../COLAMD/Lib/libcolamd.a $(LIB_WITH_PARTITION)
++	-lcholmod -lamd \
++	-lcolamd $(LIB_WITH_PARTITION)
  
- # use the BLAS and LAPACK defined by UFconfig.mk; do not use valgrind 
+ # use the BLAS and LAPACK defined by SuiteSparse_config.mk; do not use valgrind 
  FLIB = $(LAPACK) $(BLAS)
-@@ -119,7 +113,7 @@
+@@ -140,7 +133,7 @@
  	../Include/SuiteSparseQR_definitions.h \
  	../Include/SuiteSparseQR.hpp Makefile
  
--I = -I../../CHOLMOD/Include -I../../UFconfig -I../Include
+-I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include
 +I = -I/usr/include/cholmod -I../Include
  
  C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I)

================================================================
Index: packages/SPQR/SPQR.spec
diff -u packages/SPQR/SPQR.spec:1.1 packages/SPQR/SPQR.spec:1.2
--- packages/SPQR/SPQR.spec:1.1	Sun Jan  8 12:56:38 2012
+++ packages/SPQR/SPQR.spec	Wed Jun 27 19:16:33 2012
@@ -2,19 +2,20 @@
 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.2.3
+Version:	1.3.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://www.cise.ufl.edu/research/sparse/SPQR/%{name}-%{version}.tar.gz
-# Source0-md5:	65e12826a2a3d11a774c517990eabdd7
+# Source0-md5:	0c3838dda38b56b2186b0d225ffc089f
 Patch0:		%{name}-ufconfig.patch
 Patch1:		%{name}-shared.patch
 URL:		http://www.cise.ufl.edu/research/sparse/SPQR/
-BuildRequires:	CHOLMOD-devel >= 1.7.4
-BuildRequires:	UFconfig >= 3.7.0
+BuildRequires:	CHOLMOD-devel >= 2.0.0
+BuildRequires:	SuiteSparse_config-devel >= 4.0.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
+Requires:	CHOLMOD >= 2.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,8 +42,8 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki SPQR
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	CHOLMOD-devel >= 1.7.4
-Requires:	UFconfig >= 3.7.0
+Requires:	CHOLMOD-devel >= 2.0.0
+Requires:	SuiteSparse_config-devel >= 4.0.0
 Requires:	libstdc++-devel
 
 %description devel
@@ -116,5 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/06/27 17:16:33  qboosh
+- updated to 1.3.0; switched to SuiteSparse_config
+- updated ufconfig,shared patches
+
 Revision 1.1  2012/01/08 11:56:38  qboosh
 - new
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/SPQR/SPQR-shared.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/SPQR/SPQR-ufconfig.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/SPQR/SPQR.spec?r1=1.1&r2=1.2

More information about the pld-cvs-commit mailing list