- added ac,format patches to fix build with current toolchain

- pl, separated -apidocs

diff --git a/sundials.spec b/sundials.spec
index 805de4f1f0eb4d824649fea3b1992cf46eb42fd9..2ed2065413bf1d4703ece306a63b0600863f9932 100644 (file)
--- a/sundials.spec
+++ b/sundials.spec
@@ -1,31 +1,57 @@
+# TODO: MPI support
 Summary:       SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
+Summary(pl.UTF-8):     Zbiór procedur do rozwiązywania równań nieliniowych i różniczkowych/algebraicznych
 Name:          sundials
 Version:       2.3.0
 Release:       2
 License:       BSD
-Group:         Development/Libraries
+Group:         Libraries
 Source0:       https://computation.llnl.gov/casc/sundials/download/code/%{name}-%{version}.tar.gz
 # Source0-md5: c236f2a7e0e6a03b8fab3d189471b933
 Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-ac.patch
+Patch2:                %{name}-format.patch
 URL:           https://computation.llnl.gov/casc/sundials/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
+BuildRequires: gcc-fortran
 BuildRequires: libtool
+BuildRequires: rpm-build >= 4.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)
-consists of the following four solvers:
+SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
+Solvers) consists of the following four solvers:
+
+CVODE: solves initial value problems for ordinary differential
+equation (ODE) systems.
+
+CVODES:        solves ODE systems and includes sensitivity analysis
+capabilities (forward and adjoint).
+
+IDA: solves initial value problems for differential-algebraic equation
+(DAE) systems.
+
+KINSOL: solves nonlinear algebraic systems.
+
+%description -l pl.UTF-8
+SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
+Solvers) to zbiór procedur do rozwiązywania równań nieliniowych i
+różniczkowych/algebraicznych, składający się z czterech części:
+
+CVODE - rozwiązuje problemy wartości początkowej dla układów
+równań różniczkowych zwyczajnych (ODE)
+
+CVODES - rozwiązuje układy równań różniczkowych zwyczajnych; zawiera
+funkcjonalność analizy wrażliwości (prostej i sprzężonej).
 
-CVODE  solves initial value problems for ordinary differential
-       equation (ODE) systems.
-CVODES         solves ODE systems and includes sensitivity analysis
-       capabilities (forward and adjoint).
-IDA    solves initial value problems for differential-algebraic
-       equation (DAE) systems.
-KINSOL         solves nonlinear algebraic systems.
+IDA - rozwiązuje problemy wartości początkowej dla układów równań
+różniczkowo-algebraicznych (DAE).
+
+KINSOL - rozwiązuje układy nieliniowych równań algebraicznych.
 
 %package devel
 Summary:       SUNDIALS development files
+Summary(pl.UTF-8):     Pliki programistyczne SUNDIALS
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
@@ -33,28 +59,50 @@ Requires:   %{name} = %{version}-%{release}
 This package contains headers and development files needed to
 develop applications with SUNDIALS.
 
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe i programistyczne potrzebne do
+tworzenia aplikacji z użyciem SUNDIALS.
+
 %package static
 Summary:       SUNDIALS static libraries
+Summary(pl.UTF-8):     Biblioteki statyczne SUNDIALS
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains SUNDIALS static libraries.
 
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczne biblioteki SUNDIALS.
+
+%package apidocs
+Summary:       API documentation for SUNDIALS libraries
+Summary(pl.UTF-8):     Dokumentacja API bibliotek SUNDIALS
+Group:         Documentation
+BuildArch:     noarch
+
+%description apidocs
+API documentation for SUNDIALS libraries.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek SUNDIALS.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-rm -f libtool ltmain.sh
-cp -f /usr/share/libtool/config/ltmain.sh config
-%{__aclocal}
+%{__libtoolize}
+%{__mv} ltmain.sh config
+%{__aclocal} -I config
 %{__autoconf}
 %configure \
        F77="gfortran" \
-       --enable-shared \
+       --enable-examples \
        --disable-mpi \
-       --enable-examples
+       --enable-shared
 
 %{__make}
 
@@ -74,19 +122,56 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.0
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.1
+%doc LICENSE README
+%attr(755,root,root) %{_libdir}/libsundials_cvode.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_cvode.so.0
+%attr(755,root,root) %{_libdir}/libsundials_cvodes.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_cvodes.so.1
+%attr(755,root,root) %{_libdir}/libsundials_ida.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_ida.so.1
+%attr(755,root,root) %{_libdir}/libsundials_kinsol.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_kinsol.so.0
+%attr(755,root,root) %{_libdir}/libsundials_nvecserial.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecserial.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc README doc/*/*.pdf
 %attr(755,root,root) %{_bindir}/sundials-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libsundials_cvode.so
+%attr(755,root,root) %{_libdir}/libsundials_cvodes.so
+%attr(755,root,root) %{_libdir}/libsundials_ida.so
+%attr(755,root,root) %{_libdir}/libsundials_kinsol.so
+%attr(755,root,root) %{_libdir}/libsundials_nvecserial.so
+%{_libdir}/libsundials_cvode.la
+%{_libdir}/libsundials_cvodes.la
+%{_libdir}/libsundials_ida.la
+%{_libdir}/libsundials_kinsol.la
+%{_libdir}/libsundials_nvecserial.la
+# Fortran
+%{_libdir}/libsundials_fcvode.a
+%{_libdir}/libsundials_fcvode.la
+%{_libdir}/libsundials_fida.a
+%{_libdir}/libsundials_fida.la
+%{_libdir}/libsundials_fkinsol.a
+%{_libdir}/libsundials_fkinsol.la
+%{_libdir}/libsundials_fnvecserial.a
+%{_libdir}/libsundials_fnvecserial.la
+%{_includedir}/cvode
+%{_includedir}/cvodes
+%{_includedir}/ida
+%{_includedir}/kinsol
+%{_includedir}/nvector
+%{_includedir}/sundials
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsundials_cvode.a
+%{_libdir}/libsundials_cvodes.a
+%{_libdir}/libsundials_ida.a
+%{_libdir}/libsundials_kinsol.a
+%{_libdir}/libsundials_nvecserial.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/*/*.pdf