[packages/ltris] - updated to 1.0.19 - use upstream .desktop file and icon (with desktop patch) - sgid games for high

qboosh qboosh at pld-linux.org
Wed Sep 7 18:49:43 CEST 2016


commit a4e53c9bbc81c1a7f4fd708732feb6d45ad0ac94
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 7 18:51:12 2016 +0200

    - updated to 1.0.19
    - use upstream .desktop file and icon (with desktop patch)
    - sgid games for high scores to work

 ltris-desktop.patch |  32 ++++++++++++++++++++++++++++++++
 ltris.desktop       |  10 ----------
 ltris.png           | Bin 1682 -> 0 bytes
 ltris.spec          |  33 +++++++++++++++++++--------------
 4 files changed, 51 insertions(+), 24 deletions(-)
---
diff --git a/ltris.spec b/ltris.spec
index b45f7cd..85c5453 100644
--- a/ltris.spec
+++ b/ltris.spec
@@ -1,44 +1,49 @@
 Summary:	A tetris clone for Linux
 Summary(pl.UTF-8):	Klon tetrisa dla Linuksa
 Name:		ltris
-Version:	1.0.18
+Version:	1.0.19
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://downloads.sourceforge.net/lgames/%{name}-%{version}.tar.gz
-# Source0-md5:	533be97db3f6589e879b905c66a44300
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-URL:		http://lgames.sourceforge.net/index.php?project=LTris
+# Source0-md5:	63486b90e59699823f7093bc9ab87725
+Patch0:		%{name}-desktop.patch
+URL:		http://lgames.sourceforge.net/LTris
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	SDL-devel >= 1.2.4
 BuildRequires:	SDL_mixer-devel
+BuildRequires:	gettext-tools
+Requires:	SDL >= 1.2.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_localstatedir	/var/games
 
 %description
-LTris is a clone of the tetris game for Linux. It uses a SDL library.
+LTris is a clone of the Tetris game for Linux. It uses a SDL library.
 
 %description -l pl.UTF-8
-LTris jest klonem gry tetris dla Linuksa. Korzysta z biblioteki SDL.
+LTris jest klonem gry Tetris dla Linuksa. Korzysta z biblioteki SDL.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__gettextize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-
 %find_lang %{name}
 
 %clean
@@ -46,9 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
-%attr(755,root,games) %{_bindir}/ltris
+%doc AUTHORS ChangeLog README
+%attr(2755,root,games) %{_bindir}/ltris
 %{_desktopdir}/ltris.desktop
-%{_pixmapsdir}/*.png
+%{_pixmapsdir}/ltris48.gif
 %{_datadir}/ltris
 %attr(664,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/ltris.hscr
diff --git a/ltris-desktop.patch b/ltris-desktop.patch
new file mode 100644
index 0000000..1a6db03
--- /dev/null
+++ b/ltris-desktop.patch
@@ -0,0 +1,32 @@
+--- ltris-1.0.19/ltris.desktop.in.orig	2013-05-03 19:13:13.000000000 +0200
++++ ltris-1.0.19/ltris.desktop.in	2016-09-07 18:22:49.937133008 +0200
+@@ -1,7 +1,8 @@
+ [Desktop Entry]
+ Name=LTris
+ Comment=A tetris clone with nice graphics.
++Comment[pl]=Klon tetrisa z �adn� grafik�.
+ Exec=ltris
+ Icon=
+ Type=Application
+-Categories=Game;
++Categories=Game;ArcadeGame;
+--- ltris-1.0.19/Makefile.am.orig	2013-05-03 19:13:13.000000000 +0200
++++ ltris-1.0.19/Makefile.am	2016-09-07 18:24:26.810465235 +0200
+@@ -6,7 +6,7 @@
+ 
+ desktopdir = $(datadir)/applications
+ desktop_DATA = ltris.desktop
+-icondir = $(datadir)/icons
++icondir = $(datadir)/pixmaps
+ icon_DATA = ltris48.gif
+ 
+ AUTOMAKE_OPTIONS = foreign
+@@ -15,7 +15,7 @@
+ # the right way to handle it? At least it works... as long as $datadir
+ # does not contain plus signs. :-)
+ ltris.desktop:
+-	@sed -e "s+Icon=+Icon=$(datadir)/icons/ltris48.gif+" \
++	@sed -e "s+Icon=+Icon=$(datadir)/pixmaps/ltris48.gif+" \
+ 	< ltris.desktop.in > ltris.desktop
+ 
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/ltris.desktop b/ltris.desktop
deleted file mode 100644
index e4770c6..0000000
--- a/ltris.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=LTris
-Comment=Tetris for Linux
-Comment[pl]=Tetris dla Linuksa
-Icon=ltris
-Exec=ltris
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;
-# vi: encoding=utf-8
diff --git a/ltris.png b/ltris.png
deleted file mode 100644
index d1462bb..0000000
Binary files a/ltris.png and /dev/null differ
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ltris.git/commitdiff/a4e53c9bbc81c1a7f4fd708732feb6d45ad0ac94



More information about the pld-cvs-commit mailing list