From 390cfb579f1631e4f638a875ea3995e216ba731a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 28 May 2023 16:21:19 +0200 Subject: [PATCH] Various small cleanups [skip changelog] (cherry picked from commit a70b88ec67388c1293119694ccbec10fd5ef6dc0) --- dolfin.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dolfin.spec b/dolfin.spec index ff935c7..ef20bfa 100644 --- a/dolfin.spec +++ b/dolfin.spec @@ -107,7 +107,8 @@ sed -r -i 's|boost/detail/endian.hpp|boost/endian/arithmetic.hpp|' \ mkdir -p build && cd build CFLAGS="%{optflags} -Wno-unused-variable -DH5_USE_110_API" CXXFLAGS="%{optflags} -DH5_USE_110_API" %cmake .. \ %{cmake_blas_flags} \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=off + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=off \ + -Wno-dev %make_build # "temporary install" so the python build can find the stuff it needs @@ -124,9 +125,9 @@ cd ../python VERBOSE=1 CMAKE_PREFIX_PATH=%{buildroot}/usr/share/dolfin/cmake CMAKE_SKIP_INSTALL_RPATH=yes CMAKE_SKIP_RPATH=yes %py3_install sed -r -i '1 {s|#!/usr/bin/env python.*|#!%{__python3}|}' \ - %{buildroot}/usr/bin/dolfin-order \ - %{buildroot}/usr/bin/dolfin-plot \ - %{buildroot}/usr/bin/dolfin-convert + %{buildroot}%{_bindir}/dolfin-order \ + %{buildroot}%{_bindir}/dolfin-plot \ + %{buildroot}%{_bindir}/dolfin-convert # this file is just pointless rm %{buildroot}/usr/share/dolfin/dolfin.conf @@ -141,8 +142,8 @@ ctest -V %{?_smp_mflags} %files %license COPYING COPYING.LESSER AUTHORS %doc README.rst -/usr/bin/dolfin-version -/usr/bin/fenics-version +%{_bindir}/dolfin-version +%{_bindir}/fenics-version %{_libdir}/libdolfin.so.%{fenics_version} %{_libdir}/libdolfin.so.%{fenics_version}.* %dir /usr/share/dolfin @@ -157,13 +158,13 @@ ctest -V %{?_smp_mflags} /usr/share/dolfin/cmake/ %files doc -/usr/bin/dolfin-get-demos +%{_bindir}/dolfin-get-demos /usr/share/dolfin/demo/ %files -n python3-dolfin -/usr/bin/dolfin-convert -/usr/bin/dolfin-order -/usr/bin/dolfin-plot +%{_bindir}/dolfin-convert +%{_bindir}/dolfin-order +%{_bindir}/dolfin-plot %{python3_sitearch}/dolfin/ %{python3_sitearch}/dolfin_utils/ %{python3_sitearch}/fenics/