rpms/starfighter/devel starfighter.spec,1.6,1.7

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	starfighter.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: starfighter.spec
===================================================================
RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- starfighter.spec	22 May 2005 23:43:03 -0000	1.6
+++ starfighter.spec	9 Feb 2006 18:39:11 -0000	1.7
@@ -1,22 +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: 5
-
+Release: 6%{?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
@@ -61,16 +55,11 @@
 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
@@ -83,14 +72,14 @@
 %{_prefix}/games/starfighter
 %{_prefix}/share/games/starfighter
 %{_datadir}/pixmaps/starfighter.png
-%if %{!?_without_freedesktop:1}0
 %{_datadir}/applications/fedora-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %changelog
+* 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