- Use %autosetup macro. Allows to eliminate the usage of deprecated
diff --git a/armagetron.spec b/armagetron.spec
index 38b5225..8093c21 100644
--- a/armagetron.spec
+++ b/armagetron.spec
@@ -16,28 +16,27 @@
#
+%define series 0.2.9
+%define src_name %{name}ad
Name: armagetron
-Version: 0.2.8.3.5
+Version: %{series}.2.3
Release: 0
Summary: OpenGL Game Similar to the Film Tron
License: GPL-2.0-or-later
Group: Amusements/Games/Action/Arcade
-URL: http://armagetronad.sourceforge.net
-Source: https://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2
-Source1: armagetron_add.tar.bz2
-# PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare
-Patch0: reproducible.patch
-BuildRequires: autoconf
-BuildRequires: automake
+URL: https://www.armagetronad.org
+Source0: https://launchpad.net/%{src_name}/%{series}/%{version}/+download/%{src_name}-%{version}.tbz
+Patch0: armagetron-desktop-files-installdir.patch
BuildRequires: gcc-c++
+BuildRequires: libSDL_image-devel
BuildRequires: libpng-devel
+BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: llvm-clang
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(SDL_image)
BuildRequires: pkgconfig(SDL_mixer)
BuildRequires: pkgconfig(glu)
-BuildRequires: pkgconfig(sdl)
Requires(post): coreutils
%description
@@ -49,10 +48,10 @@ to try to make your enemies hit the walls, while you avoid doing the
same. Unlike glTron, this program does not require 3D hardware support.
%prep
-%autosetup -p1 -a 1 -n armagetronad-%{version}
+%autosetup -p1 -n armagetronad-%{version}
%build
-autoreconf -fi
+autoreconf -fvi
# clang does not support lto yet
%define _lto_cflags %{nil}
tmpflags="%{optflags} -fPIE -pie"
@@ -71,41 +70,29 @@ tmpflags=${tmpflags/-fstack-protector-strong}
--disable-games \
--docdir=%{_docdir} \
CXXFLAGS="${tmpflags}"
-make %{?_smp_mflags}
+%make_build
%install
# the uninstall_location trick was copied from Fedora. Thanks for debugging it :)
-make DESTDIR=%{buildroot} install uninstall_location=foobar
-mkdir -p %{buildroot}%{_datadir}/applications/
-install armagetron_add/*.desktop %{buildroot}%{_datadir}/applications/
-mkdir -p %{buildroot}%{_datadir}/appdata
-install -m644 armagetron_add/Armagetron.appdata.xml %{buildroot}%{_datadir}/appdata/
-mkdir -p %{buildroot}%{_datadir}/pixmaps/
-install -Dm644 armagetron_add/README.SuSE %{buildroot}%{_docdir}/%{name}/README.SUSE
-pushd %{buildroot}
-mv %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
-ln -s %{_datadir}/pixmaps/%{name}.png %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
-popd
+%make_install uninstall_location=foobar
# some cleanups
rm %{buildroot}%{_sysconfdir}/armagetronad/rc.config
rm %{buildroot}%{_sysconfdir}/armagetronad/settings_dedicated.cfg
-rm %{buildroot}%{_datadir}/armagetronad/language/update.py
rm %{buildroot}%{_datadir}/armagetronad/scripts/relocate
-rm %{buildroot}%{_datadir}/armagetronad/desktop/*.desktop
+rm %{buildroot}%{_bindir}/armagetronad-master
mv %{buildroot}%{_docdir}/armagetronad ./armagetron_doc
-%suse_update_desktop_file Armagetron Game ArcadeGame
+chmod -x %{buildroot}%{_datadir}/armagetronad/scripts/rcd_*
+%suse_update_desktop_file armagetronad Game ArcadeGame
%files
%license COPYING
%doc README armagetron_doc/*
-%doc %{_docdir}/%{name}/README.SUSE
%config %{_sysconfdir}/armagetronad
%{_bindir}/armagetronad
-%{_datadir}/armagetronad
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/Armagetron.appdata.xml
-%attr(644,root,root) %{_datadir}/applications/*
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/armagetronad/
+%{_datadir}/metainfo/armagetronad.appdata.xml
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*.png
%post
if [ ! -e %{_datadir}/armagetron/music/fire.xm ]; then
diff --git a/armagetron_add.tar.bz2 b/armagetron_add.tar.bz2
deleted file mode 120000
index 7d8c1f0..0000000
--- a/armagetron_add.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreifij3srm47vaavqsrsuqzwdybmriq32nb77a7xvpvwqxxidqnhdam
\ No newline at end of file
diff --git a/armagetronad-0.2.8.3.5.src.tar.bz2 b/armagetronad-0.2.8.3.5.src.tar.bz2
deleted file mode 120000
index d964583..0000000
--- a/armagetronad-0.2.8.3.5.src.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeifo6tkaioojmoquxvqoqgmumvhm34qq5x34bets4blw5si3k7ldrq
\ No newline at end of file
diff --git a/armagetronad-0.2.9.2.3.tbz b/armagetronad-0.2.9.2.3.tbz
new file mode 120000
index 0000000..18be2c8
--- /dev/null
+++ b/armagetronad-0.2.9.2.3.tbz
@@ -0,0 +1 @@
+/ipfs/bafybeigcsl67525bumxts7slii2pbtvadn3tt7g5fx5wszcekxwbywnxn4
\ No newline at end of file
diff --git a/reproducible.patch b/reproducible.patch
deleted file mode 100644
index 6f12082..0000000
--- a/reproducible.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: armagetronad-0.2.8.3.3/src/doc/html.m4.in
-===================================================================
---- armagetronad-0.2.8.3.3.orig/src/doc/html.m4.in
-+++ armagetronad-0.2.8.3.3/src/doc/html.m4.in
-@@ -6,7 +6,7 @@ define(HEADSTART,dnl
-
-
- changequote([,])dnl
--
-+
-
-
- $1)dnl
-Index: armagetronad-0.2.8.3.3/src/doc/net/sig.m4
-===================================================================
---- armagetronad-0.2.8.3.3.orig/src/doc/net/sig.m4
-+++ armagetronad-0.2.8.3.3/src/doc/net/sig.m4
-@@ -3,7 +3,7 @@
- Manuel Moos(MAILMANGLE( z-man, users, sf.net )).
-
-
--Last modification: esyscmd(date)
-+Last modification: esyscmd(date -r index.html.m4)
-
-
-