rpms/suitesparse/devel suitesparse.spec,1.14,1.15

[Miloš Jakubíček]

Author: mjakubicek

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

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




Index: suitesparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/devel/suitesparse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- suitesparse.spec	10 May 2009 23:51:07 -0000	1.14
+++ suitesparse.spec	20 May 2009 15:32:42 -0000	1.15
@@ -1,13 +1,13 @@
 Name:           suitesparse
 Version:        3.3.0
-Release:        1%{?dist}
+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
@@ -60,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
@@ -101,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
@@ -117,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
@@ -148,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
@@ -202,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"
@@ -275,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
@@ -292,8 +295,7 @@ 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
@@ -346,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
 
@@ -359,7 +359,14 @@ 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.