rpms/powermanga/devel powermanga.spec,1.7,1.8

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29180/devel

Modified Files:
	powermanga.spec 
Log Message:
Fix debuginfo package and add in $PATH (#165313).



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- powermanga.spec	25 May 2005 20:49:09 -0000	1.7
+++ powermanga.spec	7 Nov 2005 12:08:11 -0000	1.8
@@ -1,12 +1,7 @@
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.79
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -14,8 +9,7 @@
 Source1: powermanga.png
 Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, SDL-devel, SDL_mixer-devel
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -31,13 +25,18 @@
 Name=Powermanga
 Comment=Arcade 2D shoot-them-up game
 Icon=powermanga.png
-Exec=%{_prefix}/games/powermanga
+Exec=powermanga
 Terminal=false
 Type=Application
 Categories=Application;Game;ArcadeGame;
 Encoding=UTF-8
 EOF
 
+%{__cat} > %{name}.sh << 'EOF'
+#!/bin/bash
+exec %{_prefix}/games/powermanga "$@"
+EOF
+
 
 %build
 %configure
@@ -48,25 +47,27 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+# Install wrapper script
+%{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
+
+# Allow stripping, g+s will be set in %%files
+%{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
+
 # Fix location of the man page
-%{__mkdir_p} %{buildroot}%{_mandir}/man6
+%{__mkdir_p} %{buildroot}%{_mandir}/man6/
 %{__mv} %{buildroot}%{_prefix}/share/man/powermanga.6 \
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/powermanga.png
+%{__install} -D -m 0644 %{SOURCE1} \
+    %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
-%if %{!?_without_freedesktop:1}0
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
-%else
-%{__install} -D -m 0644 %{name}.desktop \
-    %{buildroot}%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %clean
@@ -76,6 +77,7 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS CHANGES COPYING README
+%{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
 %{_datadir}/pixmaps/powermanga.png
@@ -83,14 +85,16 @@
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi-easy
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi-hard
-%if %{!?_without_freedesktop:1}0
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
+%{_datadir}/applications/*-%{name}.desktop
 
 
 %changelog
+* Mon Nov  7 2005 Matthias Saou <http://freshrpms.net/> 0.79-6
+- Fix stripping (when g+s is set, it doesn't happen) and add wrapper script in
+  $PATH (#165313, Ville Skyttä).
+- Let SDL-devel pull in X devel files.
+- Remove old freedesktop build conditional.
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.79-5
 - add patch from Ignacio to fix build on x86_64 (#158464)