[packages/atanks] - updated to 6.6
qboosh
qboosh at pld-linux.org
Tue Dec 26 09:26:54 CET 2023
commit 40d0bb5988346d6ddfded66cab61edd58ef7c882
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Dec 26 09:27:29 2023 +0100
- updated to 6.6
atanks-desktop.patch | 10 ++---
atanks-flags.patch | 116 ++++-----------------------------------------------
atanks.spec | 31 +++++++-------
3 files changed, 26 insertions(+), 131 deletions(-)
---
diff --git a/atanks.spec b/atanks.spec
index 0db584e..41c886e 100644
--- a/atanks.spec
+++ b/atanks.spec
@@ -1,18 +1,18 @@
Summary: Atomic Tanks - a game similiar to Scorched Earth and Worms
Summary(pl.UTF-8): Atomic Tanks - gra podobna do Scorched Earth oraz Worms
Name: atanks
-Version: 5.2
+Version: 6.6
Release: 1
Epoch: 1
-License: GPL
+License: GPL v2+
Group: X11/Applications/Games
-Source0: http://downloads.sourceforge.net/atanks/%{name}-%{version}.tar.gz
-# Source0-md5: 05bedbb7b3f50831a30b47f7776c8c1a
+Source0: https://downloads.sourceforge.net/atanks/%{name}-%{version}.tar.gz
+# Source0-md5: f53bbb0017d1ed79045085f6a36c85a8
Patch0: %{name}-flags.patch
Patch1: %{name}-desktop.patch
-URL: http://atanks.sourceforge.net/
+URL: https://atanks.sourceforge.io/
BuildRequires: allegro-devel >= 4.4.0
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -36,30 +36,27 @@ teleporty i inne.
%patch1 -p1
%build
+CPPFLAGS="%{rpmcppflags}" \
+CXXFLAGS="%{rpmcxxflags}" \
+LDFLAGS="%{rpmldflags}" \
%{__make} \
- CC="%{__cc}" \
- CPP="%{__cxx}" \
- CFLAGS="%{rpmcflags}" \
- LDFLAGS="%{rpmldflags}" \
- LIBS="`allegro-config --libs` -lpthread"
+ CXX="%{__cxx}"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cp -a atanks.desktop $RPM_BUILD_ROOT%{_desktopdir}
-cp -a atanks.png $RPM_BUILD_ROOT%{_pixmapsdir}
-
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc Changelog credits.txt text/* README* TODO
+%doc Changelog README TODO credits.txt
+%lang(ru) %doc README_ru.txt
%attr(755,root,root) %{_bindir}/atanks
%{_datadir}/games/%{name}
+%{_datadir}/metainfo/io.sourceforge.atanks.metainfo.xml
%{_desktopdir}/atanks.desktop
-%{_pixmapsdir}/atanks.png
+%{_iconsdir}/hicolor/48x48/apps/atanks.png
diff --git a/atanks-desktop.patch b/atanks-desktop.patch
index d527ac3..ed14403 100644
--- a/atanks-desktop.patch
+++ b/atanks-desktop.patch
@@ -1,15 +1,13 @@
---- atanks-5.2/atanks.desktop~ 2011-10-03 01:05:41.000000000 +0200
-+++ atanks-5.2/atanks.desktop 2012-02-06 13:14:48.541176105 +0100
-@@ -2,9 +2,11 @@
+--- atanks-6.6/atanks.desktop.orig 2023-12-26 08:23:15.959229156 +0100
++++ atanks-6.6/atanks.desktop 2023-12-26 09:11:07.917003759 +0100
+@@ -2,8 +2,10 @@
Name=Atomic Tanks
Comment=Destroy your opponents' tanks.
Comment[es]=Destruye los tanques de tus oponentes.
+Comment[pl]=Zniszcz wrogie czołgi
Type=Application
Exec=atanks
--Icon=atanks.png
-+Icon=atanks
+ Icon=atanks
Categories=Game;ArcadeGame;
Terminal=false
+# vi: encoding=utf-8
-
diff --git a/atanks-flags.patch b/atanks-flags.patch
index a7c8096..4a44a60 100644
--- a/atanks-flags.patch
+++ b/atanks-flags.patch
@@ -1,111 +1,11 @@
---- atanks-4.6/src/Makefile~ 2010-05-24 18:30:23.000000000 +0200
-+++ atanks-4.6/src/Makefile 2010-05-31 10:18:47.798239764 +0200
-@@ -33,82 +33,82 @@
- $(MODULES): Makefile
+--- atanks-6.6/Makefile.orig 2021-08-12 02:31:05.000000000 +0200
++++ atanks-6.6/Makefile 2023-12-26 08:18:16.587517659 +0100
+@@ -231,8 +231,6 @@ ifeq (YES,$(DEBUG))
+ CPPFLAGS := ${CPPFLAGS} -DATANKS_DEBUG_LOGTOFILE
+ endif
- atanks.o: atanks.cpp globals.h main.h menucontent.h
-- $(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c atanks.cpp -o $@
+-else
+- CXXFLAGS := -march=native ${CXXFLAGS} -O2
+ endif
- button.o: button.cpp button.h
-- $(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c button.cpp -o $@
- client.o: client.h client.cpp
-- $(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c client.cpp -o $@
-
- environment.o: environment.cpp environment.h
-- $(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c environment.cpp -o $@
-
- explosion.o: explosion.cpp explosion.h
-- $(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c explosion.cpp -o $@
-
- files.o: files.cpp files.h text.h text.cpp
-- $(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c files.cpp -o $@
-
- floattext.o: floattext.cpp floattext.h
-- $(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c floattext.cpp -o $@
-
- gameloop.o: gameloop.cpp atanks.cpp main.h
-- $(CPP) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c gameloop.cpp -o $@
-
- globaldata.o: globaldata.cpp globaldata.h
-- $(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c globaldata.cpp -o $@
-
- land.o: land.cpp land.h globaldata.h environment.h
-- $(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c land.cpp -o $@
-
- missile.o: missile.cpp missile.h
-- $(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c missile.cpp -o $@
-
- teleport.o: teleport.cpp teleport.h
-- $(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c teleport.cpp -o $@
-
- physobj.o: physobj.cpp physobj.h
-- $(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c physobj.cpp -o $@
-
- player.o: player.cpp player.h
-- $(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c player.cpp -o $@
-
- tank.o: tank.cpp tank.h
-- $(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c tank.cpp -o $@
-
- team.o: team.cpp team.h
-- $(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c team.cpp -o $@
-
- virtobj.o: virtobj.cpp virtobj.h
-- $(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c virtobj.cpp -o $@
-
- fade.o: fade.cpp
-- $(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c fade.cpp -o $@
-
- perlin.o: perlin.cpp
-- $(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c perlin.cpp -o $@
-
- sky.o: sky.cpp sky.h
-- $(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c sky.cpp -o $@
-
- satellite.o: satellite.cpp satellite.h
-- $(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c satellite.cpp -o $@
-
- text.o: text.cpp text.h
-- $(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c text.cpp -o $@
-
- update.o: update.cpp update.h
-- $(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c update.cpp -o $@
-
- network.o: network.cpp network.h
-- $(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c network.cpp -o $@
-
- %.o: %.cpp %.h
-- $(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+ $(CPP) $(CFLAGS) $(FLAGS) -c $< -o $@
-
- $(OUTPUT): $(OBJECTS) $(MODULES)
-- $(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
-+ $(CPP) $(LDFLAGS) $(CFLAGS) $(FLAGS) $(MODULES) -o $(OUTPUT) $(LIBS)
- # strip $(OUTPUT)
-
- # dependencies:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/atanks.git/commitdiff/40d0bb5988346d6ddfded66cab61edd58ef7c882
More information about the pld-cvs-commit
mailing list