diff --git a/.gitignore b/.gitignore index 17e6a31..59b2b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /tiled-qt-0.8.1.tar.gz /tiled-qt-0.9.0.tar.gz /tiled-qt-0.9.1.tar.gz +/tiled-0.10.0.tar.gz diff --git a/sources b/sources index 188ad81..c89bdce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d032b18e0ff7d5a4a843a1ac93a9f638 tiled-qt-0.9.1.tar.gz +420b9ee87004883c98bee3cfafa808f2 tiled-0.10.0.tar.gz diff --git a/tiled-fix-64bit-plugin-finding.patch b/tiled-fix-64bit-plugin-finding.patch deleted file mode 100644 index 6aca892..0000000 --- a/tiled-fix-64bit-plugin-finding.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a404606925c0f0edbc9cee5e04f48d9a7d490d6b Mon Sep 17 00:00:00 2001 -From: Erik Schilling -Date: Sat, 15 Mar 2014 13:32:57 +0100 -Subject: [PATCH] Added a USE_FHS_PLUGIN_PATH switch - -Setting this variable during the qmake run will make tiled -correctly picking up the install dir of plugins if the -lib path differs from "../lib" (generally the case for 64 bit releases). ---- - src/tiled/pluginmanager.cpp | 5 +++++ - tiled.pri | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/src/tiled/pluginmanager.cpp b/src/tiled/pluginmanager.cpp -index 7755d42..078fa84 100644 ---- a/src/tiled/pluginmanager.cpp -+++ b/src/tiled/pluginmanager.cpp -@@ -62,11 +62,16 @@ void PluginManager::loadPlugins() - mPlugins.append(Plugin(QLatin1String(""), instance)); - - // Determine the plugin path based on the application location -+#ifndef TILED_PLUGIN_DIR - QString pluginPath = QCoreApplication::applicationDirPath(); -+#endif -+ - #ifdef Q_OS_WIN32 - pluginPath += QLatin1String("/plugins/tiled"); - #elif defined(Q_OS_MAC) - pluginPath += QLatin1String("/../PlugIns"); -+#elif defined(TILED_PLUGIN_DIR) -+ QString pluginPath = QLatin1String(TILED_PLUGIN_DIR); - #else - pluginPath += QLatin1String("/../lib/tiled/plugins"); - #endif -diff --git a/tiled.pri b/tiled.pri -index 66a6a42..1ec9c8c 100644 ---- a/tiled.pri -+++ b/tiled.pri -@@ -10,3 +10,8 @@ macx { - } - - CONFIG += depend_includepath -+ -+ -+!isEmpty(USE_FHS_PLUGIN_PATH) { -+ DEFINES += TILED_PLUGIN_DIR=\\\"$${LIBDIR}/tiled/plugins/\\\" -+} --- -1.8.5.3 - diff --git a/tiled.spec b/tiled.spec index b34414c..8e26738 100644 --- a/tiled.spec +++ b/tiled.spec @@ -1,19 +1,20 @@ Name: tiled -Version: 0.9.1 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: Tiled Map Editor # tiled itself is GPLv2+, libtiled and tmxviewer are BSD License: GPLv2+ and BSD URL: http://www.mapeditor.org -Source0: http://sourceforge.net/projects/%{name}/files/%{name}-qt/%{version}/%{name}-qt-%{version}.tar.gz -# See: https://github.com/bjorn/tiled/issues/269 -Patch0: %{name}-fix-64bit-plugin-finding.patch +Source0: https://github.com/bjorn/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: qt4-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: qt5-qttools-devel +BuildRequires: zlib-devel BuildRequires: desktop-file-utils +BuildRequires: python-devel %description -Tiled is a general purpose tile map editor. It's built to be easy to use, +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 is an RPG, platformer or Breakout clone. Tiled is free software and written in C++, using the Qt application framework. @@ -21,10 +22,18 @@ in C++, using the Qt application framework. This package contains the tiled application and tmxviewer, a simple application to view Tiled maps. +%package plugin-python +Summary: Python plugin for Tiled +License: GPLv2+ +URL: http://www.mapeditor.org +Requires: %{name} = %{version}-%{release} +%description plugin-python +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-tmw -Summary: The Mana World plugin for tiled +Summary: The Mana World plugin for Tiled License: GPLv2+ URL: http://www.mapeditor.org Requires: %{name} = %{version}-%{release} @@ -34,7 +43,7 @@ A plugin for tiled which allows to export maps as eAthena collision files. %{pluginwarning} %package plugin-droidcraft -Summary: Droidcraft plugin for tiled +Summary: Droidcraft plugin for Tiled License: GPLv2+ URL: http://www.mapeditor.org Requires: %{name} = %{version}-%{release} @@ -44,7 +53,7 @@ A plugin for tiled which allows to save maps as .dat droidcraft maps. %{pluginwarning} %package plugin-flare -Summary: Flare plugin for tiled +Summary: Flare plugin for Tiled License: GPLv2+ URL: http://www.mapeditor.org Requires: %{name} = %{version}-%{release} @@ -54,7 +63,7 @@ A plugin for tiled which allows to save maps as .txt flare maps. %{pluginwarning} %package plugin-replica-island -Summary: Replica Island plugin for tiled +Summary: Replica Island plugin for Tiled License: GPLv2+ URL: http://www.mapeditor.org Requires: %{name} = %{version}-%{release} @@ -64,7 +73,7 @@ A plugin for tiled which allows to save maps as .bin Replica Island maps. %{pluginwarning} %package plugin-t-engine4 -Summary: T-Engine4 plugin for tiled +Summary: T-Engine4 plugin for Tiled License: GPLv2+ URL: http://www.mapeditor.org Requires: %{name} = %{version}-%{release} @@ -74,13 +83,12 @@ A plugin for tiled which allows to export maps as .lua T-Engine4 maps. %{pluginwarning} %prep -%setup -q -n %{name}-qt-%{version} -%patch0 -p1 +%setup -q # Remove copy of zlib rm -rf src/zlib %build -qmake-qt4 -r PREFIX=%{_prefix} LIBDIR=%{_libdir} RPATH=no USE_FHS_PLUGIN_PATH=yes +%_qt5_qmake -r PREFIX=%{_prefix} LIBDIR=%{_libdir} RPATH=no USE_FHS_PLUGIN_PATH=yes make %{?_smp_mflags} %install @@ -92,6 +100,12 @@ find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf # Validate desktop file desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +# Appdata +install -D -p -m644 docs/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml +# Needs a bleeding edge validator since the current one does not support +# the metadata license the way it is even though it is correct. +#appdata-validate --relax %{buildroot}/%{_datadir}/appdata/*.appdata.xml + # locale files %find_lang %{name} --with-qt @@ -101,6 +115,8 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so %post /sbin/ldconfig /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-desktop-database &> /dev/null || : %postun /sbin/ldconfig @@ -108,6 +124,8 @@ if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-desktop-database &> /dev/null || : %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -120,9 +138,10 @@ fi %{_bindir}/tmxrasterizer %{_bindir}/tmxviewer %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/16x16/apps/tiled.png -%{_datadir}/icons/hicolor/32x32/apps/tiled.png -%{_datadir}/icons/hicolor/scalable/apps/tiled.svg +%{_datadir}/icons/hicolor/*/apps/*%{name}* +%{_datadir}/icons/hicolor/*/mimetypes/*%{name}* +%{_datadir}/mime/packages/%{name}.xml +%{_datadir}/appdata/%{name}.appdata.xml %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/translations %{_libdir}/lib%{name}.so.* @@ -139,6 +158,9 @@ fi %{_mandir}/man1/tmxrasterizer.1* %{_mandir}/man1/tmxviewer.1* +%files plugin-python +%{_libdir}/%{name}/plugins/libpython.so + %files plugin-tmw %{_libdir}/%{name}/plugins/libtmw.so @@ -155,6 +177,9 @@ fi %{_libdir}/%{name}/plugins/libtengine.so %changelog +* Sun Sep 14 2014 Erik Schilling - 0.10.0-1 +- New upstream release + * Mon Aug 18 2014 Fedora Release Engineering - 0.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild