From a71179854511de0de9c01fabaf63987fc6fc831f370c8a1183c10f9e16741d70 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 15 Mar 2023 12:01:49 +0000 Subject: [PATCH] - Add tiled-1.10.0-lib.patch: Put so files into /usr/lib/64 directories OBS-URL: https://build.opensuse.org/package/show/games:tools/tiled?expand=0&rev=84 --- tiled-1.10.0-lib.patch | 39 +++++++++++++++++++++++++++++++++++++++ tiled.changes | 6 ++++++ tiled.spec | 6 ++++-- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 tiled-1.10.0-lib.patch diff --git a/tiled-1.10.0-lib.patch b/tiled-1.10.0-lib.patch new file mode 100644 index 0000000..9b96f71 --- /dev/null +++ b/tiled-1.10.0-lib.patch @@ -0,0 +1,39 @@ +Index: tiled-1.10.0/src/libtiled/libtiled.qbs +=================================================================== +--- tiled-1.10.0.orig/src/libtiled/libtiled.qbs ++++ tiled-1.10.0/src/libtiled/libtiled.qbs +@@ -209,7 +209,7 @@ DynamicLibrary { + else + return "bin" + else +- return "lib" ++ return "lib64" + } + fileTagsFilter: "dynamiclibrary" + } +Index: tiled-1.10.0/qbs/imports/TiledPlugin.qbs +=================================================================== +--- tiled-1.10.0.orig/qbs/imports/TiledPlugin.qbs ++++ tiled-1.10.0/qbs/imports/TiledPlugin.qbs +@@ -42,7 +42,7 @@ DynamicLibrary { + else if (qbs.targetOS.contains("macos")) + return "Tiled.app/Contents/PlugIns" + else +- return "lib/tiled/plugins" ++ return "lib64/tiled/plugins" + } + fileTagsFilter: "dynamiclibrary" + } +Index: tiled-1.10.0/src/tiled/libtilededitor.qbs +=================================================================== +--- tiled-1.10.0.orig/src/tiled/libtilededitor.qbs ++++ tiled-1.10.0/src/tiled/libtilededitor.qbs +@@ -608,7 +608,7 @@ DynamicLibrary { + else + return "bin" + else +- return "lib" ++ return "lib64" + } + fileTagsFilter: "dynamiclibrary" + } diff --git a/tiled.changes b/tiled.changes index 4938cb7..8c3dccc 100644 --- a/tiled.changes +++ b/tiled.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 15 12:01:22 UTC 2023 - Michael Vetter + +- Add tiled-1.10.0-lib.patch: + Put so files into /usr/lib/64 directories + ------------------------------------------------------------------- Sat Mar 11 06:08:09 UTC 2023 - Michael Vetter diff --git a/tiled.spec b/tiled.spec index b991e8d..0d5ea53 100644 --- a/tiled.spec +++ b/tiled.spec @@ -23,6 +23,7 @@ Summary: A tilemap editor License: GPL-2.0-or-later URL: https://www.mapeditor.org Source: https://github.com/mapeditor/tiled/archive/refs/tags/v%{version}.tar.gz +Patch0: tiled-1.10.0-lib.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ @@ -62,6 +63,7 @@ and tmxrasterizer which is also a command line tool. %prep %setup -q +%patch0 -p1 # Remove copy of zlib rm -rf src/zlib @@ -108,8 +110,8 @@ find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/translations %{_mandir}/man1/%{name}.1%{?ext_man} -%{_prefix}/lib/libtiled.so -%{_prefix}/lib/libtilededitor.so +%dir %{_prefix}/lib/tiled +%dir %{_prefix}/lib/tiled/plugins %{_prefix}/lib/tiled/plugins/libcsv.so %{_prefix}/lib/tiled/plugins/libdefold.so %{_prefix}/lib/tiled/plugins/libdefoldcollection.so