commit 3387a5759e0aed705c4eddd64faf7e3b447a68cb
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Wed Mar 16 23:33:58 2022 +0100
new release / first build with Meson
.gitignore | 1 +
game-data-packager.spec | 32 ++++++++++++++++++++------------
sources | 2 +-
3 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f25eb05..b84980a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/game-data-packager_65.tar.xz
/game-data-packager_66.tar.xz
/game-data-packager_68.tar.xz
+/game-data-packager_69.tar.xz
diff --git a/game-data-packager.spec b/game-data-packager.spec
index aab9de6..1fcaacf 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -9,6 +9,8 @@
# rfpkg push
# rfpkg build
+%global _vpath_srcdir %{name}-%{version}/
+
#define gitdate 20160112
# git log --oneline -1
%define gitversion 50f64b6
@@ -18,7 +20,7 @@
%endif
Name: game-data-packager
-Version: 68
+Version: 69
Release: 1%{?gver}%{?dist}
Summary: Installer for game data files
License: GPLv2 and GPLv2+
@@ -32,6 +34,7 @@ Source:
http://http.debian.net/debian/pool/contrib/g/game-data-packager/g
BuildArch: noarch
+BuildRequires: meson
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
BuildRequires: inkscape
@@ -80,21 +83,22 @@ This GUI let you select a WAD to play &
show it's description.
%prep
-%autosetup
+%autosetup -c
# id-shr-extract is not packaged
-sed -i '/wolf3d/d' tests/integration.py
+#sed -i '/wolf3d/d' tests/integration.py
# Mock: "Error: No Package found for lha"
-sed -i '/spear/d' tests/integration.py
+#sed -i '/spear/d' tests/integration.py
%build
-%configure
-%make_build
+%meson
+%meson_build
-#%check
-#DEB_BUILD_TIME_TESTS=1 make check
+%check
+echo disabled
+#DEB_BUILD_TIME_TESTS=1 % meson_test
%install
-%make_install
+%meson_install
find %{buildroot}%{_datadir}/game-data-packager/game_data_packager -name '*.py'
-exec chmod 755 {} \;
#E: python-bytecode-inconsistent-mtime
python3 -m compileall
%{buildroot}%{_datadir}/game-data-packager/game_data_packager/version.py
@@ -117,8 +121,8 @@ rm -v %{buildroot}%{_mandir}/man6/quake*.6
desktop-file-validate %{buildroot}%{_datadir}/applications/doom2-masterlevels.desktop
%files
-%doc doc/adding_a_game.mdwn
-%license COPYING
+%doc %{name}-%{version}/doc/adding_a_game.mdwn
+%license %{name}-%{version}/COPYING
%{_mandir}/man6/game-data-packager.*
%{_mandir}/fr/man6/game-data-packager.*
%dir %{_sysconfdir}/game-data-packager/
@@ -129,13 +133,17 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/doom2-masterlevels.de
%{_datadir}/game-data-packager/
%files -n doom2-masterlevels
-%license COPYING
+%license %{name}-%{version}/COPYING
%{_mandir}/man6/doom2-masterlevels.*
%{_bindir}/doom2-masterlevels
%{_datadir}/applications/doom2-masterlevels.desktop
%{_datadir}/pixmaps/doom2-masterlevels.png
%changelog
+* Wed Mar 16 2022 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 69-1
+- New upstream release
+- Switch to Meson build system
+
* Fri Oct 08 2021 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 68-1
- New upstream release
diff --git a/sources b/sources
index 3f4eb53..53eda30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (game-data-packager_68.tar.xz) =
d2028e2591157b4cbbec100fd9519a19d56501f74760fd40ad0c28a15c2acb8268c7cf742c94b972781e66bd938aabfe2c4f168f5da64a573e087004c136b19b
+SHA512 (game-data-packager_69.tar.xz) =
eee94d96b0395e9ac0d47195d8775c43ace2a10818b82713b91385f42fb483433aa73f67f7affe81e2af0a52dcdee7fc3d9a2e4d349d3b078a8ed8579d16fcae