The package rpms/tiled.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/tiled.git/commit/?id=b526ab089e575f3... https://src.fedoraproject.org/cgit/rpms/tiled.git/commit/?id=c921f5b86636082....
Change: +ExcludeArch: ppc64le +ExcludeArch: ppc64
Thanks.
Full change: ============
commit 211bdacd321aca1b287a8cc73e9b23131b1d537c Author: Filipe Rosset rosset.filipe@gmail.com Date: Tue Aug 23 21:38:11 2022 -0300
- Update to 1.8.6
diff --git a/.gitignore b/.gitignore index 8115ea9..088d745 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /tiled-1.8.1.tar.gz /tiled-1.8.2.tar.gz /tiled-1.8.4.tar.gz +/tiled-1.8.6.tar.gz diff --git a/sources b/sources index 88c6ea4..255d25a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tiled-1.8.2.tar.gz) = 698add45d425d16a7b68c9b4d847cafb1d2b0633157614cbcec5f4dba23c1a65597bd2211b8c9f6b37af8ea2a4ca967fc71662672d79a8ea209dd9b0e3863413 +SHA512 (tiled-1.8.6.tar.gz) = f77ff46fbb707d8c02499f168e5748f39081fa780fb9a5b1ea04603b09cd71280d76034cab28b23fc30280bd856121e473c992c9c39d7c46fc97d5fbfbe4191d diff --git a/tiled.spec b/tiled.spec index 5b8ebc5..b940ff5 100644 --- a/tiled.spec +++ b/tiled.spec @@ -1,6 +1,6 @@ Name: tiled -Version: 1.8.2 -Release: 5%{?dist} +Version: 1.8.6 +Release: 1%{?dist} Summary: Tiled Map Editor # tiled itself is GPLv2+, libtiled and tmxviewer are BSD License: GPLv2+ and BSD @@ -24,6 +24,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel BuildRequires: zlib-devel
+# exclude ppc64le due FTBFS all the time ExcludeArch: ppc64le
%description @@ -254,6 +255,9 @@ mkdir -p %{buildroot}%{_libdir} %{_libdir}/%{name}/plugins/libyy.so
%changelog +* Wed Aug 24 2022 Filipe Rosset rosset.filipe@gmail.com - 1.8.6-1 +- Update to 1.8.6 + * Tue Aug 23 2022 Filipe Rosset rosset.filipe@gmail.com - 1.8.2-5 - Fix FTBFS for rawhide version 1.8.2 using qbs
commit b526ab089e575f3e8381b1a3ca97d5fb0c03bdce Author: Filipe Rosset rosset.filipe@gmail.com Date: Tue Aug 23 21:02:17 2022 -0300
disable build for ppc64le
diff --git a/tiled.spec b/tiled.spec index e1b9a5b..5b8ebc5 100644 --- a/tiled.spec +++ b/tiled.spec @@ -24,7 +24,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel BuildRequires: zlib-devel
-ExcludeArch: ppc64 +ExcludeArch: ppc64le
%description Tiled is a general purpose tile map editor. It is built to be easy to use,
commit c921f5b866360827725adb4221866ca6439fbc43 Author: Filipe Rosset rosset.filipe@gmail.com Date: Tue Aug 23 20:48:02 2022 -0300
disable build for ppc64
diff --git a/tiled.spec b/tiled.spec index c21c768..e1b9a5b 100644 --- a/tiled.spec +++ b/tiled.spec @@ -24,6 +24,8 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel BuildRequires: zlib-devel
+ExcludeArch: ppc64 + %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
commit eb99d2db6c09ecfc4054eacf6f12338c68478a9c Author: Filipe Rosset rosset.filipe@gmail.com Date: Tue Aug 23 20:22:22 2022 -0300
- Fix FTBFS for rawhide version 1.8.2 using qbs
diff --git a/sources b/sources index b98d6f9..88c6ea4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tiled-1.8.4.tar.gz) = 04ff52e2d555a38d7f24e1e13344db81c93d054381a8104b259afa0eafa4d72a9c27e4b6a5260fd6fa552d23d0f8802c446fcbe678cec615b80bc346ecda255b +SHA512 (tiled-1.8.2.tar.gz) = 698add45d425d16a7b68c9b4d847cafb1d2b0633157614cbcec5f4dba23c1a65597bd2211b8c9f6b37af8ea2a4ca967fc71662672d79a8ea209dd9b0e3863413
commit 776b7903f6473ae74dcb95b2969fb44906398778 Author: Filipe Rosset rosset.filipe@gmail.com Date: Tue Aug 23 20:16:53 2022 -0300
- 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/%%7Bname%7D/archive/v%%7Bversion%7D/%%7Bname%7D 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
commit 5c1448cc848f1021487312c8ae42be47cd5c40a5 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Jul 23 10:28:47 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/tiled.spec b/tiled.spec index 8ecdcf0..77ecd02 100644 --- a/tiled.spec +++ b/tiled.spec @@ -1,6 +1,6 @@ Name: tiled Version: 1.8.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tiled Map Editor # tiled itself is GPLv2+, libtiled and tmxviewer are BSD License: GPLv2+ and BSD @@ -215,6 +215,9 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so %{_libdir}/%{name}/plugins/libyy.so
%changelog +* Sat Jul 23 2022 Fedora Release Engineering releng@fedoraproject.org - 1.8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint python-maint@redhat.com - 1.8.4-2 - Rebuilt for Python 3.11
commit f8c373864662d4e1b1ca0bad2d676b2f0f9909bc Author: Python Maint python-maint@redhat.com Date: Mon Jun 13 15:39:03 2022 +0200
Rebuilt for Python 3.11
diff --git a/tiled.spec b/tiled.spec index 32e88ed..8ecdcf0 100644 --- a/tiled.spec +++ b/tiled.spec @@ -1,6 +1,6 @@ Name: tiled Version: 1.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tiled Map Editor # tiled itself is GPLv2+, libtiled and tmxviewer are BSD License: GPLv2+ and BSD @@ -215,6 +215,9 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so %{_libdir}/%{name}/plugins/libyy.so
%changelog +* Mon Jun 13 2022 Python Maint python-maint@redhat.com - 1.8.4-2 +- Rebuilt for Python 3.11 + * Tue Apr 05 2022 josef radinger cheese@nosuchhost.net - 1.8.4-1 - bump version - add qt5-qtsvg to BuildRequires
commit 4475956d9f218512f9ffccd0f8b06cedc94a4323 Author: josef radinger cheese@nosuchhost.net Date: Sat Apr 9 18:47:05 2022 +0200
bump version
diff --git a/.gitignore b/.gitignore index a1c6479..8115ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /tiled-1.7.2.tar.gz /tiled-1.8.1.tar.gz /tiled-1.8.2.tar.gz +/tiled-1.8.4.tar.gz diff --git a/sources b/sources index 88c6ea4..b98d6f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tiled-1.8.2.tar.gz) = 698add45d425d16a7b68c9b4d847cafb1d2b0633157614cbcec5f4dba23c1a65597bd2211b8c9f6b37af8ea2a4ca967fc71662672d79a8ea209dd9b0e3863413 +SHA512 (tiled-1.8.4.tar.gz) = 04ff52e2d555a38d7f24e1e13344db81c93d054381a8104b259afa0eafa4d72a9c27e4b6a5260fd6fa552d23d0f8802c446fcbe678cec615b80bc346ecda255b diff --git a/tiled.spec b/tiled.spec index 8f3d9f2..32e88ed 100644 --- a/tiled.spec +++ b/tiled.spec @@ -1,5 +1,5 @@ Name: tiled -Version: 1.8.2 +Version: 1.8.4 Release: 1%{?dist} Summary: Tiled Map Editor # tiled itself is GPLv2+, libtiled and tmxviewer are BSD @@ -11,12 +11,18 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libappstream-glib BuildRequires: make +BuildRequires: qbs +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-static +BuildRequires: qt5-qtdeclarative-static +BuildRequires: qt5-qtsvg 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 @@ -124,14 +130,16 @@ as GameMaker Studio 2.3 room files (.yy). rm -rf src/zlib
%build -%qmake_qt5 -r PREFIX=%{_prefix} LIBDIR=%{_libdir} RPATH=no USE_FHS_PLUGIN_PATH=yes -make %{?_smp_mflags} - +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 +#make %{?_smp_mflags} %install -make install INSTALL_ROOT=%{buildroot} +qbs qbs.installPrefix:"/usr" projects.Tiled.useRPaths:false projects.Tiled.installHeaders:true projects.Tiled.enableZstd:true +qbs install --install-root %{buildroot}
# Clean build artefacts -find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf +find -name ".uic" -or -name ".moc" -or -name ".rcc" -delete
# Validate desktop file desktop-file-validate %{buildroot}/%{_datadir}/applications/org.mapeditor.Tiled.desktop @@ -207,6 +215,13 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so %{_libdir}/%{name}/plugins/libyy.so
%changelog +* Tue Apr 05 2022 josef radinger cheese@nosuchhost.net - 1.8.4-1 +- bump version +- add qt5-qtsvg to BuildRequires + +* Sat Mar 12 2022 josef radinger cheese@nosuchhost.net - 1.8.2-2 +- switch to qbs + * Tue Feb 22 2022 josef radinger cheese@nosuchhost.net - 1.8.2-1 - bump version