From 12ef1688779d26dbb365a5a142d917b3549f2d10 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 15 Jun 2024 19:44:33 +0200 Subject: [PATCH] - updated to 1.0.7 --- barrage-desktop.patch | 12 +++++------- barrage-icondir.patch | 20 ++++++++++++++++++++ barrage.spec | 23 ++++++++++++++--------- 3 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 barrage-icondir.patch diff --git a/barrage-desktop.patch b/barrage-desktop.patch index 27cf530..b3bf811 100644 --- a/barrage-desktop.patch +++ b/barrage-desktop.patch @@ -1,12 +1,10 @@ ---- barrage-1.0.4/barrage.desktop.orig 2016-09-06 21:45:06.587980962 +0200 -+++ barrage-1.0.4/barrage.desktop 2016-09-06 21:45:09.334647597 +0200 -@@ -1,7 +1,8 @@ - [Desktop Entry] +--- barrage-1.0.7/barrage.desktop.in.orig 2023-04-29 17:33:51.000000000 +0200 ++++ barrage-1.0.7/barrage.desktop.in 2024-06-15 19:35:40.012198230 +0200 +@@ -2,6 +2,7 @@ Name=Barrage Comment=A rather destructive action game. + Comment[de]=Ein eher destruktives Action-Spiel +Comment[pl]=Dość destruktywna gra akcji. Exec=barrage - Icon=barrage.png + Icon= Type=Application --Categories=Game; -+Categories=Game;ArcadeGame; diff --git a/barrage-icondir.patch b/barrage-icondir.patch new file mode 100644 index 0000000..399af29 --- /dev/null +++ b/barrage-icondir.patch @@ -0,0 +1,20 @@ +--- barrage-1.0.7/Makefile.am.orig 2023-04-29 17:33:51.000000000 +0200 ++++ barrage-1.0.7/Makefile.am 2024-06-15 19:39:25.754308614 +0200 +@@ -8,7 +8,7 @@ rpm: dist + + desktopdir = $(datadir)/applications + desktop_DATA = barrage.desktop +-icondir = $(datadir)/icons ++icondir = $(datadir)/pixmaps + icon_DATA = barrage48.png + + EXTRA_DIST = BUGS README COPYING AUTHORS ChangeLog INSTALL NEWS TODO \ +@@ -18,7 +18,7 @@ EXTRA_DIST = BUGS README COPYING AUTHORS + # the right way to handle it? At least it works... as long as $datadir + # does not contain plus signs. :-) + barrage.desktop: +- @sed -e "s+Icon=+Icon=$(datadir)/icons/barrage48.png+" \ ++ @sed -e "s+Icon=+Icon=$(icondir)/barrage48.png+" \ + < barrage.desktop.in > barrage.desktop + + ACLOCAL_AMFLAGS = -I m4 diff --git a/barrage.spec b/barrage.spec index 3e0b41a..40b6274 100644 --- a/barrage.spec +++ b/barrage.spec @@ -1,17 +1,19 @@ Summary: Kill and destroy as many target as possible in 3 minutes Summary(pl.UTF-8): Zniszcz jak najwięcej wrogów w przeciągu 3 minut Name: barrage -Version: 1.0.4 +Version: 1.0.7 Release: 1 License: GPL v2+ Group: X11/Applications/Games -Source0: http://downloads.sourceforge.net/lgames/%{name}-%{version}.tar.gz -# Source0-md5: 8c767edc4cf3f84cbfb6dc19e24f5743 +Source0: https://downloads.sourceforge.net/lgames/%{name}-%{version}.tar.gz +# Source0-md5: 0bb7a7033e467c95210852029366df4f Patch0: %{name}-desktop.patch -URL: http://lgames.sourceforge.net/Barrage +Patch1: %{name}-icondir.patch +URL: https://lgames.sourceforge.net/Barrage +BuildRequires: SDL-devel >= 1.2.0 BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.69 BuildRequires: automake BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -32,13 +34,15 @@ osiągnięcie dobrych wyników jest trudnym zadaniem. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --localstatedir=/var/games %{__make} %install @@ -54,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS BUGS ChangeLog README %attr(2755,root,games) %{_bindir}/barrage -%{_datadir}/games/%{name} +%{_datadir}/barrage +%attr(664,root,games) /var/games/barrage.hscr %{_desktopdir}/barrage.desktop -%{_iconsdir}/hicolor/*/apps/%{name}.png +%{_pixmapsdir}/barrage48.png -- 2.44.0