commit 1d57b4c44016a82ee72912b4fed53b8fdf00cb68 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Fri Jun 24 19:36:14 2022 +0200 Add libdir Patch shotcut-libdir.patch | 17 +++++++++++++++++ shotcut.spec | 13 +++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) --- diff --git a/shotcut-libdir.patch b/shotcut-libdir.patch new file mode 100644 index 0000000..764072d --- /dev/null +++ b/shotcut-libdir.patch @@ -0,0 +1,17 @@ +--- CuteLogger/CMakeLists.txt.orig 2022-06-07 20:54:20.000000000 +0200 ++++ CuteLogger/CMakeLists.txt 2022-06-24 19:07:29.721554683 +0200 +@@ -6,6 +6,8 @@ + + ADD_DEFINITIONS(-DCUTELOGGER_LIBRARY) + ++include(GNUInstallDirs) ++ + INCLUDE_DIRECTORIES(BEFORE include) + + SET(sources +@@ -39,4 +41,4 @@ + + ADD_LIBRARY(${library_target} SHARED ${sources} ${includes}) + TARGET_LINK_LIBRARIES(${library_target} Qt5::Core) +-INSTALL(TARGETS ${library_target} DESTINATION lib) ++INSTALL(TARGETS ${library_target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/shotcut.spec b/shotcut.spec index c60bfe9..26b15df 100644 --- a/shotcut.spec +++ b/shotcut.spec @@ -1,6 +1,6 @@ Name: shotcut Version: 22.06.07 -Release: 1%{dist} +Release: 2%{dist} #Release: 0.1.beta1%%{dist} Summary: A free, open source, cross-platform video editor # The entire source code is GPLv3+ except mvcp/ which is LGPLv2+ @@ -10,7 +10,8 @@ Source0: https://github.com/mltframework/shotcut/archive/v%{version}.tar. # https://forum.shotcut.org/t/appdata-xml-file-for-gnome-software-center/2742 Source1: %{name}.appdata.xml # Force X -Patch1: Force_X.patch +Patch0: Force_X.patch +Patch1: shotcut-libdir.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -126,11 +127,8 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ # Postmortem debugging tools for MinGW. rm -rf drmingw -# fix libdir path -sed -i -e 's|DESTINATION lib|DESTINATION ${LIB_INSTALL_DIR}|'g CuteLogger/CMakeLists.txt - %build -%cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DUNIX_STRUCTURE=1 -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DSHOTCUT_VERSION=%{version} \ @@ -190,6 +188,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S %doc doc %changelog +* Fri Jun 24 2022 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 22.06.07-2 +- Add libdir Patch + * Thu Jun 23 2022 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 22.06.07-1 - Update to 22.06.07 - Use cmake instead of qmake