rpms/starfighter/EL-4 starfighter-1.1-makefile.patch, 1.1, 1.2 starfighter.spec, 1.4, 1.5

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/starfighter/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398/EL-4

Modified Files:
	starfighter-1.1-makefile.patch starfighter.spec 
Log Message:
Move binary and data to "proper" locations by updating patch (#229197).


starfighter-1.1-makefile.patch:

Index: starfighter-1.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/starfighter/EL-4/starfighter-1.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- starfighter-1.1-makefile.patch	9 Nov 2004 02:50:17 -0000	1.1
+++ starfighter-1.1-makefile.patch	15 Jun 2007 15:12:56 -0000	1.2
@@ -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 @@
 -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)
  


Index: starfighter.spec
===================================================================
RCS file: /cvs/extras/rpms/starfighter/EL-4/starfighter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- starfighter.spec	2 Feb 2005 13:15:06 -0000	1.4
+++ starfighter.spec	15 Jun 2007 15:12:56 -0000	1.5
@@ -1,21 +1,16 @@
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Project: Starfighter, a space arcade game
 Name: starfighter
 Version: 1.1
-Release: 3
+Release: 9%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/starfighter.php
+# No absolute URL since the home page tunnels it through a PHP script
 Source0: starfighter-%{version}-1.tar.bz2
 Source1: starfighter.png
 Patch: starfighter-1.1-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, desktop-file-utils
 
 %description
 After decades of war one company, who had gained powerful supplying both sides
@@ -29,8 +24,10 @@
 
 
 %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
@@ -53,23 +50,18 @@
 Name=Project: Starfighter
 Comment=Space Arcade Game
 Icon=starfighter.png
-Exec=%{_prefix}/games/starfighter
+Exec=starfighter
 Terminal=false
 Type=Application
 Categories=Application;Game;ArcadeGame;
 Encoding=UTF-8
 EOF
 
-%if 0%{!?_without_freedesktop:1}
 %{__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
@@ -77,19 +69,34 @@
 
 
 %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
-%if %{!?_without_freedesktop:1}0
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
+%{_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.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.1-7
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.1-6
+- Rebuild for new gcc/glibc.
+- Clean up spec file a little (desktop file conditional).
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.1-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Jan  5 2005 Matthias Saou <http://freshrpms.net/> 1.1-3
 - Fix desktop_vendor in the desktop file name (#143285).