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

[Matthias Saou (thias)]

Author: thias

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

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



Index: viruskiller.spec
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- viruskiller.spec	30 May 2005 23:15:16 -0000	1.6
+++ viruskiller.spec	9 Feb 2006 19:14:58 -0000	1.7
@@ -1,24 +1,17 @@
-%define desktop_vendor fedora
-
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Frantic shooting game where viruses invade your computer
 Name: viruskiller
 Version: 0.9
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/virusKiller.php
+# No absolute URL since the home page tunnels it through a PHP script
 Source: viruskiller-%{version}-1.tar.gz
 Patch0: viruskiller-0.9-makefile.patch
 Patch1: viruskiller-0.9-zzip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
-BuildRequires: zziplib-devel
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+BuildRequires: zziplib-devel, desktop-file-utils
 
 %description
 Your computer has been invaded! Dozens of little viruses are pouring in via
@@ -29,9 +22,6 @@
 will just eat them right there on the spot! See how long you and your computer
 can survive the onslaught!
 
-Available rpmbuild rebuild options :
---without : freedesktop
-
 
 %prep
 %setup
@@ -63,16 +53,11 @@
 Encoding=UTF-8
 EOF
 
-%if %{!?_without_freedesktop:1}0
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
-    --vendor %{desktop_vendor} \
+    --vendor fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
-%else
-%{__install} -D -m 0644 %{name}.desktop \
-    %{buildroot}%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %clean
@@ -85,14 +70,14 @@
 %{_prefix}/games/viruskiller
 %{_prefix}/share/games/viruskiller
 %{_datadir}/pixmaps/viruskiller.png
-%if %{!?_without_freedesktop:1}0
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
+%{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.9-6
+- Rebuild for new gcc/glibc.
+- Remove old desktop file conditionals.
+
 * Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9-5
 - rebuild once more as 0.9-4 src.rpm failed to build in build system