From a1ed3c178124b4f84a1b6c1f5619350f1df1dcbc Mon Sep 17 00:00:00 2001
From: Rahul Sundaram <sundaram@fedoraproject.org>
Date: Feb 14 2013 07:56:16 +0000
Subject: remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247


- clean up spec to follow current guidelines
- drop obsolete cruft

---

diff --git a/bzflag.spec b/bzflag.spec
index cef4c93..9480b6f 100644
--- a/bzflag.spec
+++ b/bzflag.spec
@@ -1,76 +1,33 @@
-#### options:
-# --with/--without options:
-# modular_x: rebuild with modular X deps
-# opengl_wrapper: use Fedora OpenGL wrapper
-# SDL: use SDL (instead of accessing X11, sound devices directly)
-
-#### default options:
-%if %{?fedora}%{!?fedora:5} < 5
-# default to non-modular X on FC < 5
-%bcond_with modular_x
-%else
-# default to modular X on FC >= 5 and elsewhere
-%bcond_without modular_x
-%endif
-
-%if %{?fedora}%{!?fedora:7} >= 7
-%bcond_with opengl_wrapper
-%else
-%bcond_without opengl_wrapper
-%endif
-
-%if %{?fedora}%{!?fedora:9} >= 9
-%define _libcurl_devel 1
-%else
-%define _libcurl_devel 0
-%endif
-
-%bcond_without SDL
-
-%define desktop_vendor fedora
 
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.12-findresolutions.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if %{with modular_x}
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXext-devel
 BuildRequires: libSM-devel
 BuildRequires: libICE-devel
 BuildRequires: libX11-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: gcc-c++
 BuildRequires: desktop-file-utils
-%if %{with SDL}
 BuildRequires: SDL-devel
-%endif
 BuildRequires: ncurses-devel
-%if %_libcurl_devel
 BuildRequires: libcurl-devel
-%else
-BuildRequires: curl-devel
-%endif
 BuildRequires: c-ares-devel
 BuildRequires: glew-devel
 BuildRequires: zlib-devel
 # for curl version checking in configure. ugh.
 BuildRequires: bc
-%if %{with opengl_wrapper}
 BuildRequires: sed
 Requires: opengl-games-utils
-%endif
 
 %description
 BZFlag is a 3D multi-player tank battle game  that  allows users to play
@@ -99,49 +56,33 @@ This package contains sample world maps for bzflag.
 CFLAGS='-fPIC %{optflags} -fno-strict-aliasing' \
 CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing' \
 LDFLAGS='-pie' \
-%configure \
-%if ! %{with SDL}
-    --without-SDL \
-%endif
---libdir=%{_libdir}/%{name}
+%configure --libdir=%{_libdir}/%{name} 
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%make_install
 install -D -m 644 package/rpm/bzflag-m.xpm \
     %{buildroot}%{_datadir}/pixmaps/bzflag.xpm
 mkdir -p %{buildroot}%{_datadir}/bzflag/maps
 install -m 644 misc/maps/*.bzw %{buildroot}%{_datadir}/bzflag/maps
 rm -f %{buildroot}%{_libdir}/bzflag/*.la
 
-%if %{with opengl_wrapper}
 ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/bzflag-wrapper
 sed 's:^Exec=\(.*\)$:Exec=\1-wrapper:g' < %{SOURCE1} > bzflag.desktop
-%else
-cp -dpf %{SOURCE1} bzflag.desktop
-%endif
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} \
-    --dir %{buildroot}%{_datadir}/applications \
-    bzflag.desktop
-
-%clean
-rm -rf %{buildroot}
+desktop-file-install --dir %{buildroot}%{_datadir}/applications bzflag.desktop
 
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING ChangeLog README README.Linux
 %{_bindir}/bzadmin
 %{_bindir}/bzflag
-%if %{with opengl_wrapper}
 %{_bindir}/bzflag-wrapper
-%endif
 %{_bindir}/bzfs
 %dir %{_libdir}/bzflag
 %{_libdir}/bzflag/*.so
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/bzflag
 %exclude %{_datadir}/bzflag/maps/*
 %{_datadir}/pixmaps/bzflag.xpm
@@ -152,6 +93,11 @@ rm -rf %{buildroot}
 %{_datadir}/bzflag/maps/*
 
 %changelog
+* Thu Feb 14 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 2.4.2-4
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+- drop obsolete cruft
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild