diff --git a/stp.spec b/stp.spec index e2868da..186aad0 100644 --- a/stp.spec +++ b/stp.spec @@ -1,6 +1,6 @@ Name: stp Version: 2.3.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Constraint solver/decision procedure License: MIT @@ -70,6 +70,13 @@ sed '/SATSolver.h/a#undef var_Undef\n#undef l_True\n#undef l_False\n#undef l_Und touch -r include/stp/Sat/CryptoMinisat5.h.orig include/stp/Sat/CryptoMinisat5.h rm -f include/stp/Sat/CryptoMinisat5.h.orig +# Prevent useless rpaths +sed -e '/CMAKE_SKIP_BUILD_RPATH/s/FALSE/TRUE/' \ + -e '/SET(CMAKE_INSTALL_RPATH .*)/d' \ + -e '/CMAKE_INSTALL_RPATH_USE_LINK_PATH/s/TRUE/FALSE/' \ + -e '/isSystemDir/d' \ + -i CMakeLists.txt + %build export CFLAGS="%{optflags} -I %{_includedir}/minisat" export CXXFLAGS="%{optflags} -I %{_includedir}/minisat" @@ -78,7 +85,7 @@ export CXXFLAGS="%{optflags} -I %{_includedir}/minisat" -DPYTHON_INCLUDE_DIR:FILEPATH=%{_includedir}/python%{python3_version} # Fix the help2man invocation -sed -i "s,help2man,LD_LIBRARY_PATH=$PWD/lib &," \ +sed -i "s,help2man,LD_LIBRARY_PATH=$PWD/%{_vpath_builddir}/lib &," \ %{_vpath_builddir}/CMakeFiles/man_stp.dir/build.make %cmake_build @@ -106,6 +113,9 @@ mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}/man %{python3_sitelib}/%{name}/ %changelog +* Tue Mar 30 2021 Jerry James - 2.3.3-14 +- Remove useless rpaths + * Wed Jan 27 2021 Fedora Release Engineering - 2.3.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild