X-Git-Url: http://git.pld-linux.org/?p=packages%2FCHOLMOD.git;a=blobdiff_plain;f=CHOLMOD.spec;h=9000b7ed72139667da26af3ee5faa22bae8ee4a2;hp=2fa1f0ad261a51ec4f37aa4b014a1c5e54e46f50;hb=HEAD;hpb=f6ba16c653d5f07aa64cd9b7c2d4503737f4c201

diff --git a/CHOLMOD.spec b/CHOLMOD.spec
index 2fa1f0a..79dc82b 100644
--- a/CHOLMOD.spec
+++ b/CHOLMOD.spec
@@ -1,39 +1,60 @@
 #
 # Conditional build:
-%bcond_with	metis		# build with metis lib
+%bcond_with	metis		# build with partition support (using metis lib)
 #
 Summary:	CHOLMOD: sparse supernodal Cholesky factorization and update/downdate
+Summary(pl.UTF-8):	CHOLMOD - rzadki wielowęzłowy rozkład Cholesky'ego z poprawianiem
 Name:		CHOLMOD
-Version:	1.6.0
-Release:	1
-License:	LGPL
+Version:	3.0.1
+Release:	5
+License:	GPL v2+ (some parts LGPL v2.1+)
 Group:		Libraries
 Source0:	http://www.cise.ufl.edu/research/sparse/cholmod/%{name}-%{version}.tar.gz
-# Source0-md5:	d07af9879992e597fb197daaefd2eb19
+# Source0-md5:	677c2fac5bf480c125801ced2f51f9fe
 Patch0:		%{name}-ufconfig.patch
 Patch1:		%{name}-shared.patch
+# http://www.cise.ufl.edu/research/sparse/cholmod/metis.patch (for METIS 5)
+Patch2:		%{name}-metis.patch
 URL:		http://www.cise.ufl.edu/research/sparse/cholmod/
+BuildRequires:	AMD-devel >= 2.4.0
+BuildRequires:	CAMD-devel >= 2.4.0
+BuildRequires:	CCOLAMD-devel >= 2.9.0
+BuildRequires:	COLAMD-devel >= 2.9.0
+BuildRequires:	SuiteSparse_config-devel >= 4.3.0
 BuildRequires:	blas-devel
-BuildRequires:	CCOLAMD-devel
-BuildRequires:	AMD-devel
-BuildRequires:	CAMD-devel
-BuildRequires:	COLAMD-devel
+BuildRequires:	gcc-fortran
 BuildRequires:	lapack-devel
 BuildRequires:	libtool >= 2:1.5
-%{?with_metis:BuildRequires:	metis-devel}
-BuildRequires:	UFconfig
+%if %{with metis}
+BuildRequires:	metis-devel >= 5
+%endif
+Requires:	AMD >= 2.4.0
+Requires:	CAMD >= 2.4.0
+Requires:	CCOLAMD >= 2.9.0
+Requires:	COLAMD >= 2.9.0
+Requires:	SuiteSparse_config-libs >= 4.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 CHOLMOD is a set of ANSI C routines for sparse Cholesky
 factorization and update/downdate.
 
+%description -l pl.UTF-8
+CHOLMOD to zbiór procedur ANSI C do rzadkiego rozkładu Cholesky'ego z
+poprawianiem.
+
 %package devel
 Summary:	Header files for CHOLMOD library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki CHOLMOD
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	UFconfig
+Requires:	AMD-devel >= 2.4.0
+Requires:	CAMD-devel >= 2.4.0
+Requires:	CCOLAMD-devel >= 2.9.0
+Requires:	COLAMD-devel >= 2.9.0
+Requires:	SuiteSparse_config-devel >= 4.3.0
+Requires:	blas-devel
+Requires:	lapack-devel
 
 %description devel
 Header files for CHOLMOD library.
@@ -57,16 +78,14 @@ Statyczna biblioteka CHOLMOD.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-%if %{with metis}
-	CFLAGS="%{rpmcflags} -fPIC" \
-%else
-	CFLAGS="%{rpmcflags} -fPIC -DNPARTITION" \
-	METIS= \
-%endif
+	%{!?with_metis:CHOLMOD_CONFIG=-DNPARTITION} \
+	%{?with_metis:WITH_METIS=1} \
+	CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}" \
 	libdir=%{_libdir}
 
@@ -88,11 +107,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt Doc/UserGuide.pdf
+%doc README.txt Doc/ChangeLog
 %attr(755,root,root) %{_libdir}/libcholmod.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcholmod.so.0
 
 %files devel
 %defattr(644,root,root,755)
+%doc Doc/UserGuide.pdf
 %attr(755,root,root) %{_libdir}/libcholmod.so
 %{_libdir}/libcholmod.la
 %{_includedir}/cholmod