Hello community, here is the log from the commit of package suitesparse for openSUSE:Factory checked in at 2012-08-26 11:35:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suitesparse (Old) and /work/SRC/openSUSE:Factory/.suitesparse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suitesparse", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/suitesparse/suitesparse.changes 2012-08-04 13:32:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.suitesparse.new/suitesparse.changes 2012-08-26 11:35:19.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Aug 16 19:33:14 UTC 2012 - [email protected] + +- also re-fix bnc#746867: + * cholmod from suitesparse should be GPL-2.0 and/or LGPL-2.0 licensed + +------------------------------------------------------------------- +Wed Aug 15 02:51:27 UTC 2012 - [email protected] + +- fix bnc#775418: SuiteSparse does not ship library which contains +the symbol SuiteSparse_time + * it's because latest SuiteSparse prefers NTIMER.(try to depreciate) + so when there's NTIMER avaiable, tic/toc will not be enabled. + * easy solution is to use "-lSuiteSparse" in the UMFPACK_LIBS + variable in the affected packages like Octave. + * but this seems to affect many packages in science repo, so I + just add a patch comment #IF NTIMER off. + * http://comments.gmane.org/gmane.comp.gnu.octave.general/42837 +- add sub-package libsuitesparse_config which is formly known as UFconfig. + * also add provides/obsoltes of UFconfig. + * add patch0 to prevent removal of .o after .a is built. + we still need .o to make shared libsuitesparseconfig.so + +------------------------------------------------------------------- New: ---- bnc775418-enable-SuiteSparse_time-symbol.patch no-removal-of-suitesparse_config-output.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suitesparse.spec ++++++ --- /var/tmp/diff_new_pack.YdsS9s/_old 2012-08-26 11:35:20.000000000 +0200 +++ /var/tmp/diff_new_pack.YdsS9s/_new 2012-08-26 11:35:20.000000000 +0200 @@ -15,15 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: suitesparse Summary: A collection of sparse matrix libraries +License: GPL-2.0+ and LGPL-2.1+ +Group: Development/Libraries/Parallel Version: 4.0.2 Release: 0 -Group: Development/Libraries/Parallel -License: GPL-2.0+ and LGPL-2.1+ Url: http://www.cise.ufl.edu/research/sparse/SuiteSparse Source: SuiteSparse-%{version}.tar.gz Source2: %{name}-rpmlintrc +Patch0: no-removal-of-suitesparse_config-output.patch +Patch775418: bnc775418-enable-SuiteSparse_time-symbol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: gcc-c++ @@ -55,6 +58,10 @@ %define spqrso 1_3_1 %define umfpackver 5.6.1 %define umfpackso 5_6_1 +# Your need define even it's just the same as main package +# or the %build loop will override %version with umfpack's version. +%define configver 4.0.2 +%define configso 4_0_2 %define amdlib libamd-%{amdso} %define btflib libbtf-%{btfso} %define camdlib libcamd-%{camdso} @@ -68,6 +75,7 @@ %define rbiolib librbio-%{rbioso} %define spqrlib libspqr-%{spqrso} %define umfpacklib libumfpack-%{umfpackso} +%define configlib libsuitesparseconfig-%{configver} %description suitesparse is a collection of libraries for computations involving sparse @@ -75,6 +83,7 @@ %package devel Summary: Development headers for SuiteSparse +License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/Parallel Requires: %{amdlib} = %{amdver} Requires: %{btflib} = %{btfver} @@ -82,6 +91,8 @@ Requires: %{ccolamdlib} = %{ccolamdver} Requires: %{cholmodlib} = %{cholmodver} Requires: %{colamdlib} = %{colamdver} +Requires: %{configlib} = %{configver} +Requires: %{configlib} = %{version} Requires: %{csparselib} = %{csparsever} Requires: %{cxsparselib} = %{cxsparsever} Requires: %{klulib} = %{kluver} @@ -124,6 +135,10 @@ Obsoletes: libspqr-devel < %{spqrver} Provides: libumfpack-devel = %{umfpackver} Obsoletes: libumfpack-devel < %{umfpackver} +Provides: libsuitesparseconfig-devel = %{configver} +Obsoletes: libsuitesparseconfig-devel < %{configver} +Provides: UFconfig-devel = %{configver} +Obsoletes: UFconfig-devel < %{configver} %description devel suitesparse is a collection of libraries for computations involving @@ -148,6 +163,7 @@ %package devel-static Summary: Static version of SuiteSparse libraries +License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} @@ -157,9 +173,10 @@ %package -n %{amdlib} Version: %{amdver} +Release: 0 Summary: Symmetric Approximate Minimum Degree -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{amdlib} AMD is a set of routines for ordering a sparse matrix prior to @@ -173,9 +190,10 @@ %package -n %{btflib} Version: %{btfver} +Release: 0 Summary: Permutation to Block Triangular Form -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{btflib} BTF permutes an unsymmetric matrix (square or rectangular) into its @@ -186,9 +204,10 @@ %package -n %{camdlib} Version: %{camdver} +Release: 0 Summary: Symmetric Approximate Minimum Degree -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{camdlib} CAMD is a set of routines for ordering a sparse matrix prior to @@ -200,9 +219,10 @@ %package -n %{ccolamdlib} Version: %{ccolamdver} +Release: 0 Summary: Constrained Column Approximate Minimum Degree -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{ccolamdlib} CCOLAMD computes an column approximate minimum degree ordering @@ -213,9 +233,11 @@ %package -n %{cholmodlib} Version: %{cholmodver} +Release: 0 Summary: Supernodal Sparse Cholesky Factorization and Update/Downdate +#bnc746867 cholmod from suitesparse should be GPL-2.0 and/or LGPL-2.0 licensed +License: GPL-2.0 and LGPL-2.1 Group: Development/Libraries/Parallel -License: GPL-2.0+ and LGPL-2.1+ %description -n %{cholmodlib} CHOLMOD is a set of ANSI C routines for sparse Cholesky factorization @@ -238,9 +260,10 @@ %package -n %{colamdlib} Version: %{colamdver} +Release: 0 Summary: Column Approximate Minimum Degree -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{colamdlib} The COLAMD column approximate minimum degree ordering algorithm @@ -258,9 +281,10 @@ %package -n %{csparselib} Version: %{csparsever} +Release: 0 Summary: Instructional Sparse Matrix Package -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{csparselib} CSparse is a small yet feature-rich sparse matrix package written @@ -283,9 +307,10 @@ %package -n %{cxsparselib} Version: %{cxsparsever} +Release: 0 Summary: An extended version of CSparse -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{cxsparselib} CXSparse is an extended version of CSparse, with support for double @@ -295,9 +320,10 @@ %package -n %{klulib} Version: %{kluver} +Release: 0 Summary: Sparse LU Factorization, for Circuit Simulation -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{klulib} KLU is a sparse LU factorization algorithm well-suited for use in @@ -309,9 +335,10 @@ %package -n %{ldllib} Version: %{ldlver} +Release: 0 Summary: A Simple LDL^T Factorization -Group: Development/Libraries/Parallel License: LGPL-2.1+ +Group: Development/Libraries/Parallel %description -n %{ldllib} LDL is a set of concise routines for factorizing symmetric positive- @@ -328,9 +355,10 @@ %package -n %{rbiolib} Version: %{rbiover} +Release: 0 Summary: MATLAB Toolbox for Reading/Writing Sparse Matrices -Group: Development/Libraries/Parallel License: GPL-2.0+ +Group: Development/Libraries/Parallel %description -n %{rbiolib} RBio is a MATLAB toolbox for reading/writing sparse matrices in the @@ -342,9 +370,10 @@ %package -n %{spqrlib} Version: %{spqrver} +Release: 0 Summary: Multifrontal Sparse QR -Group: Development/Libraries/Parallel License: GPL-2.0+ +Group: Development/Libraries/Parallel %description -n %{spqrlib} SuiteSparseQR is an implementation of the multifrontal sparse QR @@ -359,9 +388,10 @@ %package -n %{umfpacklib} Version: %{umfpackver} +Release: 0 Summary: Sparse Multifrontal LU Factorization -Group: Development/Libraries/Parallel License: GPL-2.0+ +Group: Development/Libraries/Parallel %description -n %{umfpacklib} UMFPACK is a set of routines for solving unsymmetric sparse linear @@ -374,6 +404,23 @@ UMFPACK is part of the SuiteSparse sparse matrix suite. +%package -n %{configlib} +Version: %{configver} +Release: 0 +Summary: Common configurations for all packages in SuiteSparse +License: GPL-2.0+ +Group: Development/Libraries/Parallel +Provides: libufconfig = %{configver} +Obsoletes: libufconfig < %{configver} +Provides: libUFconfig = %{configver} +Obsoletes: libUFconfig < %{configver} + +%description -n %{configlib} +SuiteSparse_config is required by nearly all sparse matrix packages that I author or co-author. These include SuiteSparseQR, AMD, COLAMD, CCOLAMD, CHOLMOD, KLU, BTF, LDL, CXSparse, RBio, and UMFPACK. It is not required by CSparse, which is a stand-alone package. SuiteSparse_config (prior to version 4.0.0) was named UFconfig. +SuiteSparse_config contains a configuration file for "make" (SuiteSparse_config.mk) and an include file (SuiteSparse_config.h). Also included in SuiteSparse_config is a replacement for the BLAS/LAPACK xerbla routine that does not print a warning message (helpful if you don't want to link the entire Fortran I/O library into a C application). + +SuiteSparse_config is part of the SuiteSparse sparse matrix suite. + %prep %setup -q -n SuiteSparse sed 's/^CHOLMOD_CONFIG =.*/CHOLMOD_CONFIG = -DNPARTITION/' -i SuiteSparse_config/SuiteSparse_config.mk @@ -383,6 +430,9 @@ rm -rf MATLAB_Tools/Factorize/Doc/factorize_article.pdf rm -rf SPQR/Doc/algo_spqr.pdf rm -rf SPQR/Doc/spqr.pdf +# bnc#775418 +%patch0 -p1 +%patch775418 -p1 %build for dir in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse KLU LDL RBio SPQR UMFPACK; do @@ -406,6 +456,13 @@ cp Supernodal/License.txt Doc/Supernodal_License.txt popd +#bnc775418 provides SuiteSparse_time symbol in SuiteSparse_config +pushd SuiteSparse_config + make CFLAGS="%{optflags} -fPIC" + gcc -shared -Wl,-soname -Wl,"libsuitesparseconfig-%{configver}.so" -o "libsuitesparseconfig-%{configver}.so" *.o -lm + ln -s "libsuitesparseconfig-%{version}.so" "libsuitesparseconfig.so" +popd + %install mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} @@ -425,6 +482,10 @@ popd done +cp -r SuiteSparse_config/*.so* SuiteSparse_config/*.a %{buildroot}%{_libdir} +mkdir %{buildroot}%{_docdir}/%{name}/SuiteSparse_config-%{configver}/ +cp -r SuiteSparse_config/README.txt %{buildroot}%{_docdir}/%{name}/SuiteSparse_config-%{configver}/ + %post -n %{amdlib} -p /sbin/ldconfig %postun -n %{amdlib} -p /sbin/ldconfig @@ -464,6 +525,9 @@ %post -n %{umfpacklib} -p /sbin/ldconfig %postun -n %{umfpacklib} -p /sbin/ldconfig +%post -n %{configlib} -p /sbin/ldconfig +%postun -n %{configlib} -p /sbin/ldconfig + %files devel %defattr(-,root,root) %{_includedir}/%{name} @@ -555,4 +619,10 @@ %dir %{_docdir}/%{name} %{_docdir}/%{name}/UMFPACK-%{umfpackver} +%files -n %{configlib} +%defattr(-,root,root) +%{_libdir}/libsuitesparseconfig-%{configver}.so +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/SuiteSparse_config-%{configver} + %changelog ++++++ bnc775418-enable-SuiteSparse_time-symbol.patch ++++++ diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config.h SuiteSparse/SuiteSparse_config/SuiteSparse_config.h --- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config.h 2012-08-15 10:44:18.240183158 +0800 +++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.h 2012-08-15 10:48:37.033947737 +0800 @@ -121,13 +121,13 @@ ) ; /* determine which timer to use, if any */ -#ifndef NTIMER +/*#ifndef NTIMER*/ #ifdef _POSIX_C_SOURCE #if _POSIX_C_SOURCE >= 199309L #define SUITESPARSE_TIMER_ENABLED #endif #endif -#endif +/*#endif*/ /* ========================================================================== */ /* === SuiteSparse version ================================================== */ ++++++ no-removal-of-suitesparse_config-output.patch ++++++ diff -urN SuiteSparse.orig/SuiteSparse_config/Makefile SuiteSparse/SuiteSparse_config/Makefile --- SuiteSparse.orig/SuiteSparse_config/Makefile 2012-08-15 10:44:18.241183146 +0800 +++ SuiteSparse/SuiteSparse_config/Makefile 2012-08-16 01:00:40.966163200 +0800 @@ -18,7 +18,7 @@ $(CC) $(CF) -c SuiteSparse_config.c $(ARCHIVE) libsuitesparseconfig.a SuiteSparse_config.o $(RANLIB) libsuitesparseconfig.a - - $(RM) SuiteSparse_config.o +# - $(RM) SuiteSparse_config.o distclean: purge -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
