diff --git a/.gitignore b/.gitignore index 0ee6ef4..ea95a08 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ mmapper-2.0.4-final2-source.tar.gz /MMapper-2.4.4.tar.gz /MMapper-2.4.5.tar.gz /MMapper-2.5.0.tar.gz +/QtIOCompressor-src.tar.gz diff --git a/mmapper.spec b/mmapper.spec index a6b1bb2..54dfa68 100644 --- a/mmapper.spec +++ b/mmapper.spec @@ -1,20 +1,25 @@ Name: mmapper Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical MUME mapper License: GPLv2+ URL: https://github.com/MUME/MMapper Source0: https://github.com/MUME/MMapper/archive/v%{version}/MMapper-%{version}.tar.gz +# archive generated with: +# git clone git@github.com:nschimme/QtIOCompressor.git QtIOCompressor-src +# tar czf QtIOCompressor-src.tar.gz QtIOCompressor-src +Source1: QtIOCompressor-src.tar.gz BuildRequires: /usr/bin/appstream-util BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: openssl-devel BuildRequires: qt5-qtbase-devel -BuildRequires: qtiocompressor-devel BuildRequires: zlib-devel + Requires: hicolor-icon-theme +Provides: bundled(QtIOCompressor) %description MMapper is a graphical mapper for a MUD named MUME (Multi-Users in Middle @@ -26,6 +31,11 @@ data in real time and show player's position in a map. %prep %autosetup -n MMapper-%{version} +# Extract QtIOCompressor archive +mkdir -p %{_target_platform} +pushd %{_target_platform} +tar -xf %{S:1} +popd %build @@ -57,6 +67,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/mmapper.desktop %changelog +* Wed May 16 2018 Kalev Lember - 2.5.0-2 +- Use bundled QtIOCompressor as the packaged one is only for Qt4 + * Tue May 15 2018 Kalev Lember - 2.5.0-1 - Update to 2.5.0 - Set cmake build type as "Release" diff --git a/sources b/sources index 08b5c0f..6949409 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (MMapper-2.5.0.tar.gz) = 4900fd6f38360dd6a2288c69e19facd51071a3b0b677c0388221059bee20d18d6493ca074c403295e862709b02bd9c672b6d9e4f738c90b18a53cf7c2b666cb4 +SHA512 (QtIOCompressor-src.tar.gz) = 35f9705503a0e1df3644a6a8748bc95fbf63aecca8c36d77b589749637d8fa3e8fe9a67483ba78e534ba359419ff8a6e5a5944cbe21bc912b2a5a7a00be2aa30