From e0d2eb1075cad5c3da28a7d6fc30300fbdebe7d6 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Jun 15 2007 15:13:01 +0000
Subject: Move binary and data to "proper" locations by updating patch (#229197).


---

diff --git a/starfighter-1.1-makefile.patch b/starfighter-1.1-makefile.patch
index 9ca68b8..eda4651 100644
--- a/starfighter-1.1-makefile.patch
+++ b/starfighter-1.1-makefile.patch
@@ -1,6 +1,6 @@
 diff -Naupr starfighter-1.1.orig/makefile starfighter-1.1/makefile
 --- starfighter-1.1.orig/makefile	2003-08-18 14:48:23.000000000 +0200
-+++ starfighter-1.1/makefile	2004-06-08 12:58:50.994520760 +0200
++++ starfighter-1.1/makefile	2007-06-14 14:49:45.000000000 +0200
 @@ -1,21 +1,21 @@
 -CFLAGS = `sdl-config --cflags` -Wall -DLINUX
 +OPTFLAGS = -O3
@@ -17,8 +17,8 @@ diff -Naupr starfighter-1.1.orig/makefile starfighter-1.1/makefile
 -DATADIR = /usr/share/games/parallelrealities/
 -DOCDIR = /usr/share/doc/starfighter/
 +PREFIX = /usr
-+BINDIR = $(PREFIX)/games/
-+DATADIR = $(PREFIX)/share/games/starfighter/
++BINDIR = $(PREFIX)/bin/
++DATADIR = $(PREFIX)/share/starfighter/
  # top-level rule to create the program.
  all: $(PROG)
  
diff --git a/starfighter.spec b/starfighter.spec
index 09640c7..9f2dd3f 100644
--- a/starfighter.spec
+++ b/starfighter.spec
@@ -1,7 +1,7 @@
 Summary: Project: Starfighter, a space arcade game
 Name: starfighter
 Version: 1.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/starfighter.php
@@ -24,8 +24,10 @@ This game features 26 missions over 4 star systems and boss battles.
 
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .makefile
+# No files need to be executable, yet quite a few are, so fix that
+find . -type f -exec %{__chmod} -x {} \;
 
 
 %build
@@ -48,7 +50,7 @@ This game features 26 missions over 4 star systems and boss battles.
 Name=Project: Starfighter
 Comment=Space Arcade Game
 Icon=starfighter.png
-Exec=%{_prefix}/games/starfighter
+Exec=starfighter
 Terminal=false
 Type=Application
 Categories=Application;Game;ArcadeGame;
@@ -67,15 +69,18 @@ desktop-file-install \
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc docs/*
-%{_prefix}/games/starfighter
-%{_prefix}/share/games/starfighter
+%{_bindir}/starfighter
+%{_datadir}/starfighter/
 %{_datadir}/pixmaps/starfighter.png
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
+* Thu Jun 14 2007 Matthias Saou <http://freshrpms.net/> 1.1-9
+- Move binary and data to "proper" locations by updating patch (#229197).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.1-8
 - FC6 rebuild.