From 776b7903f6473ae74dcb95b2969fb44906398778 Mon Sep 17 00:00:00 2001
From: Filipe Rosset <rosset.filipe@gmail.com>
Date: Aug 23 2022 23:16:53 +0000
Subject: - Fix FTBFS for rawhide version 1.8.2 using qbs


---

diff --git a/tiled.spec b/tiled.spec
index 77ecd02..c21c768 100644
--- a/tiled.spec
+++ b/tiled.spec
@@ -1,6 +1,6 @@
 Name:           tiled
-Version:        1.8.4
-Release:        3%{?dist}
+Version:        1.8.2
+Release:        5%{?dist}
 Summary:        Tiled Map Editor
 # tiled itself is GPLv2+, libtiled and tmxviewer are BSD
 License:        GPLv2+ and BSD
@@ -10,19 +10,20 @@ Source0:        https://github.com/mapeditor/%{name}/archive/v%{version}/%{name}
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 BuildRequires:  libappstream-glib
+BuildRequires:  libzstd-devel
 BuildRequires:  make
 BuildRequires:  qbs
 BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtbase-private-devel
 BuildRequires:  qt5-qtbase-static
 BuildRequires:  qt5-qtdeclarative-static
-BuildRequires:  qt5-qtsvg
+BuildRequires:  qt5-qtsvg-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  python3-devel
 BuildRequires:  qt5-qtdeclarative-devel
 BuildRequires:  qt5-qttools-devel
 BuildRequires:  zlib-devel
 
-
 %description
 Tiled is a general purpose tile map editor. It is built to be easy to use,
 yet flexible enough to work with varying game engines, whether your game
@@ -32,6 +33,14 @@ in C++, using the Qt application framework.
 This package contains the tiled application and tmxviewer, a simple application
 to view Tiled maps.
 
+%package devel
+Summary:        Development headers for Tiled
+License:        GPLv2+
+URL:            http://www.mapeditor.org
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%description devel
+Development headers for the Tiled map editor.
+
 %package plugin-python
 Summary:        Python plugin for Tiled
 License:        GPLv2+
@@ -42,6 +51,17 @@ A plugin for tiled which allows to write Python plugins.
 
 %define pluginwarning Warning: This plugin does not offer full compatibility with Tileds features.
 
+%package plugin-rpmap
+
+Summary:        MapTool plugin for Tiled
+License:        GPLv2+
+URL:            http://www.mapeditor.org
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%description plugin-rpmap
+A plugin for tiled which allows to save maps as rpmap MapTool maps.
+
+%{pluginwarning}
+
 %package plugin-tbin
 Summary:        tBIN plugin for Tiled
 License:        GPLv2+
@@ -131,11 +151,15 @@ rm -rf src/zlib
 
 %build
 qbs setup-toolchains --detect
-qbs config defaultProfile x86_64-redhat-linux-gcc
-qbs build --command-echo-mode command-line config:release qbs.installPrefix:"/usr" projects.Tiled.useRPaths:false
+# qbs config defaultProfile x86_64-redhat-linux-gcc
+# qbs build --command-echo-mode command-line config:release qbs.installPrefix:"/usr" projects.Tiled.useRPaths:false
+qbs build --command-echo-mode command-line config:release qbs.installPrefix:"%{_prefix}" projects.Tiled.useRPaths:false
+
 #make %{?_smp_mflags}
+
 %install
-qbs qbs.installPrefix:"/usr" projects.Tiled.useRPaths:false projects.Tiled.installHeaders:true projects.Tiled.enableZstd:true
+# qbs qbs.installPrefix:"/usr" projects.Tiled.useRPaths:false projects.Tiled.installHeaders:true projects.Tiled.enableZstd:true
+qbs qbs.installPrefix:"%{_prefix}" projects.Tiled.useRPaths:false projects.Tiled.installHeaders:true projects.Tiled.enableZstd:true
 qbs install --install-root %{buildroot}
 
 # Clean build artefacts
@@ -151,7 +175,14 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.mape
 %find_lang %{name} --with-qt
 
 # Removed development file (this version does not install headers anyway)
-rm %{buildroot}/%{_libdir}/lib%{name}.so
+# rm %{buildroot}/%{_libdir}/lib%{name}.so
+
+# Hack: qbs always installs to usr/lib, move libraries if _libdir is different
+# See also:
+#  https://www.qt.io/blog/2018/10/29/deprecation-of-qbs
+#  https://github.com/mapeditor/tiled/issues/3397
+mkdir -p %{buildroot}%{_libdir}
+[ "%{buildroot}%{_prefix}/lib" = "%{buildroot}%{_libdir}" ] || mv -v %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}
 
 %ldconfig_scriptlets
 
@@ -168,7 +199,7 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so
 %{_datadir}/mime/packages/org.mapeditor.Tiled.xml
 %dir %{_datadir}/%{name}/
 %dir %{_datadir}/%{name}/translations
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/lib%{name}.*
 
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/plugins/
@@ -187,6 +218,12 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so
 %dir %{_datadir}/thumbnailers
 %{_datadir}/thumbnailers/%{name}.thumbnailer
 
+%files devel
+%{_includedir}/%{name}/
+
+%files plugin-rpmap
+%{_libdir}/%{name}/plugins/librpmap.so
+
 %files plugin-python
 %{_libdir}/%{name}/plugins/libpython.so
 
@@ -215,6 +252,9 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so
 %{_libdir}/%{name}/plugins/libyy.so
 
 %changelog
+* Tue Aug 23 2022 Filipe Rosset <rosset.filipe@gmail.com> - 1.8.2-5
+- Fix FTBFS for rawhide version 1.8.2 using qbs
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild