rpms/suitesparse/F-11 sources,1.4,1.5 suitesparse.spec,1.12,1.13

Miloš Jakubíček mjakubicek at fedoraproject.org
Wed May 20 15:33:12 UTC 2009 

Author: mjakubicek

Update of /cvs/pkgs/rpms/suitesparse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29123/F-11

Modified Files:
	sources suitesparse.spec 
Log Message:
- Split documentation into separate -doc subpackage (resolves BZ#492451).
- Update F11 branch to 3.3.0




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Dec 2008 05:22:34 -0000	1.4
+++ sources	20 May 2009 15:32:42 -0000	1.5
@@ -1 +1 @@
-d1be7abb6227568fec94179cb1300303  SuiteSparse-3.2.0.tar.gz
+d739811057c301905c99279d87f3f6d4  SuiteSparse-3.3.0.tar.gz


Index: suitesparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/F-11/suitesparse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- suitesparse.spec	26 Feb 2009 04:05:09 -0000	1.12
+++ suitesparse.spec	20 May 2009 15:32:42 -0000	1.13
@@ -1,16 +1,19 @@
 Name:           suitesparse
-Version:        3.2.0
-Release:        6%{?dist}
+Version:        3.3.0
+Release:        2%{?dist}
 Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.cise.ufl.edu/research/sparse/SuiteSparse
 Source0:        http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%{version}.tar.gz
-Patch0:		suitesparse_build.patch
+Patch0:         suitesparse_build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atlas-devel
+%ifarch %{ix86} x86_64 ia64
+BuildRequires:  tbb-devel
+%endif
 Obsoletes:      umfpack <= 5.0.1
 Obsoletes:      ufsparse <= 2.1.1
 Provides:       ufsparse = %{version}-%{release}
@@ -57,6 +60,15 @@ Provides:       ufsparse-static = %{vers
 The suitesparse-static package contains the statically linkable
 version of the suitesparse libraries.
 
+%package doc
+Summary:        Documentation files for SuiteSparse
+Group:          Documentation
+BuildArch:      noarch
+
+Requires:       %{name} = %{version}-%{release}
+
+%description doc
+This package contains documentation files for %{name}.
 
 
 %prep
@@ -64,29 +76,29 @@ version of the suitesparse libraries.
 %patch0 -p0 -b .build
 
 %build
-%define amd_version 2.2
+%define amd_version 2.2.0
 %define amd_version_major 2
-%define btf_version 1.0.1
+%define btf_version 1.1.0
 %define btf_version_major 1
 %define camd_version 2.2.0
 %define camd_version_major 2
 %define ccolamd_version 2.7.1
 %define ccolamd_version_major 2
-%define cholmod_version 1.7.0
+%define cholmod_version 1.7.1
 %define cholmod_version_major 1
-%define colamd_version 2.7.0
+%define colamd_version 2.7.1
 %define colamd_version_major 2
-%define csparse_version 2.2.2
+%define csparse_version 2.2.3
 %define csparse_version_major 2
-%define cxsparse_version 2.2.2
+%define cxsparse_version 2.2.3
 %define cxsparse_version_major 2
-%define klu_version 1.0.1
+%define klu_version 1.1.0
 %define klu_version_major 1
-%define ldl_version 2.0.0
+%define ldl_version 2.0.1
 %define ldl_version_major 2
-%define umfpack_version 5.2.0
+%define umfpack_version 5.3.0
 %define umfpack_version_major 5
-%define spqr_version 1.1.0
+%define spqr_version 1.1.1
 %define spqr_version_major 1
 ### CHOLMOD can also be compiled to use the METIS library, but it is not
 ### used here because its licensing terms exclude it from Fedora Extras.
@@ -98,9 +110,7 @@ version of the suitesparse libraries.
 ### enable_csparse as 1 below.
 %define enable_csparse 0
 
-mkdir Devel Devel/AMD Devel/CHOLMOD Devel/KLU Devel/LDL Devel/UMFPACK \
-      Doc Doc/AMD Doc/BTF Doc/CAMD Doc/CCOLAMD Doc/CHOLMOD Doc/COLAMD \
-      Doc/KLU Doc/LDL Doc/UMFPACK Doc/SPQR Lib Include
+mkdir -p Doc/{AMD,BTF,CAMD,CCOLAMD,CHOLMOD,COLAMD,KLU,LDL,UMFPACK,SPQR} Lib Include
 
 pushd AMD
   pushd Lib
@@ -114,8 +124,7 @@ pushd AMD
     cp -p ../AMD/Lib/*.a ./
   popd
   cp -p Include/*.h ../Include
-  cp -p README.txt Doc/License Doc/ChangeLog ../Doc/AMD
-  cp -p Doc/*.pdf ../Devel/AMD
+  cp -p README.txt Doc/License Doc/ChangeLog Doc/*.pdf ../Doc/AMD
 popd
 
 pushd BTF
@@ -145,8 +154,7 @@ pushd CAMD
     cp -p ../CAMD/Lib/*.a ./
   popd
   cp -p Include/*.h ../Include
-  cp -p README.txt Doc/ChangeLog Doc/License ../Doc/CAMD
-  cp -p Doc/*.pdf ../Devel/CAMD
+  cp -p README.txt Doc/ChangeLog Doc/License Doc/*.pdf ../Doc/CAMD
 popd
 
 pushd CCOLAMD
@@ -199,13 +207,12 @@ pushd CHOLMOD
     cp -p ../CHOLMOD/Lib/*.a ./
   popd
   cp -p Include/*.h ../Include
-  cp -p README.txt ../Doc/CHOLMOD
+  cp -p README.txt Doc/*.pdf ../Doc/CHOLMOD
   cp -p Cholesky/License.txt ../Doc/CHOLMOD/Cholesky_License.txt
   cp -p Core/License.txt ../Doc/CHOLMOD/Core_License.txt
   cp -p MatrixOps/License.txt ../Doc/CHOLMOD/MatrixOps_License.txt
   cp -p Partition/License.txt ../Doc/CHOLMOD/Partition_License.txt
   cp -p Supernodal/License.txt ../Doc/CHOLMOD/Supernodal_License.txt
-  cp -p Doc/*.pdf ../Devel/CHOLMOD
 popd
 
 %if "%{?enable_csparse}" == "1"
@@ -272,8 +279,7 @@ pushd LDL
     cp -p ../LDL/Lib/*.a ./
   popd
   cp -p Include/*.h ../Include
-  cp -p README.txt Doc/ChangeLog Doc/lesser.txt ../Doc/LDL
-  cp -p Doc/*.pdf ../Devel/LDL
+  cp -p README.txt Doc/ChangeLog Doc/lesser.txt Doc/*.pdf ../Doc/LDL
 popd
 
 pushd UMFPACK
@@ -289,13 +295,16 @@ pushd UMFPACK
     cp -p ../UMFPACK/Lib/*.a ./
   popd
   cp -p Include/*.h ../Include
-  cp -p README.txt Doc/License Doc/ChangeLog Doc/gpl.txt ../Doc/UMFPACK
-  cp -p Doc/*.pdf ../Devel/UMFPACK
+  cp -p README.txt Doc/License Doc/ChangeLog Doc/gpl.txt Doc/*.pdf ../Doc/UMFPACK
 popd
 
 pushd SPQR
   pushd Lib
+%ifarch %{ix86} x86_64 ia64
+    make CFLAGS="$RPM_OPT_FLAGS -DHAVE_TBB -DNPARTITION -fPIC"
+%else
     make CFLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC"
+%endif
   popd
   pushd ../Lib
     g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \
@@ -339,12 +348,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc Doc/*
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root)
-%doc Devel/*
 %{_includedir}/%{name}
 %{_libdir}/lib*.so
 
@@ -352,7 +359,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_libdir}/lib*.a
 
+%files doc
+%defattr(-,root,root)
+%doc Doc/*
+
 %changelog
+* Tue May 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.3.0-2
+- Split documentation into separate -doc subpackage (resolves BZ#492451).
+
+* Mon Apr 27 2009 Deji Akingunola <dakingun at gmail.com> - 3.3.0-1
+- Update to release 3.3.0.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

More information about the fedora-extras-commits mailing list