From 9d6eb5272afb2434debe099b8057d434dffd3b76 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 9 Nov 2017 19:31:48 +0100 Subject: [PATCH] Fix soname version --- ...no-rpath.patch => petsc-3.8-no-rpath.patch | 0 petsc.spec | 23 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) rename petsc-3.7-no-rpath.patch => petsc-3.8-no-rpath.patch (100%) diff --git a/petsc-3.7-no-rpath.patch b/petsc-3.8-no-rpath.patch similarity index 100% rename from petsc-3.7-no-rpath.patch rename to petsc-3.8-no-rpath.patch diff --git a/petsc.spec b/petsc.spec index 4f8562e..ad31e95 100644 --- a/petsc.spec +++ b/petsc.spec @@ -82,6 +82,8 @@ # 'scalapack' is required by 'mumps' %if %{with openmpi} %bcond_without mpi +# Unexpectedly 'configure' does not recognize Sundials libraries +# Linker fails with 'conftest' %bcond_with sundials %bcond_without scalapack %bcond_without mumps @@ -91,6 +93,8 @@ %if %{with mpich} %bcond_without mpi +# Unexpectedly 'configure' does not recognize Sundials libraries +# Linker fails with 'conftest' %bcond_with sundials %bcond_without scalapack %bcond_without mumps @@ -118,16 +122,18 @@ %bcond_without blas64 %endif +%global releasever 3.8 + Name: petsc Summary: Portable Extensible Toolkit for Scientific Computation -Version: 3.8.0 -Release: 3%{?dist} +Version: %{releasever}.0 +Release: 4%{?dist} License: BSD URL: https://www.mcs.anl.gov/petsc Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz ## Remove rpath flags -Patch0: %{name}-3.7-no-rpath.patch +Patch0: %{name}-%{releasever}-no-rpath.patch ## Rename library name for 64-bit integer package Patch1: %{name}-lib64.patch @@ -746,7 +752,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT%{_libdir} ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so -ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so.3.7 +ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so.%{releasever} install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name} @@ -791,7 +797,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf install -pm 755 %{_arch}/lib/libpetsc64.* $RPM_BUILD_ROOT%{_libdir} ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so -ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so.3.7 +ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so.%{releasever} install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}64 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name} @@ -838,7 +844,7 @@ mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so -ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7 +ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.%{releasever} install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name} cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name} @@ -863,7 +869,7 @@ mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so -ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7 +ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.%{releasever} install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name} cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name} @@ -1020,6 +1026,9 @@ make -C buildmpich_dir test %endif %changelog +* Thu Nov 09 2017 Antonio Trande - 3.8.0-4 +- Fix soname version + * Wed Nov 08 2017 Antonio Trande - 3.8.0-3 - Rebuild for hypre-2.13.0 - Disable sundials on MPI builds