rpms/gl-117/F-9 gl-117.desktop,1.1,1.2 gl-117.spec,1.11,1.12

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/pkgs/rpms/gl-117/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7496

Modified Files:
	gl-117.desktop gl-117.spec 
Log Message:
Sync with devel.


Index: gl-117.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gl-117/F-9/gl-117.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gl-117.desktop	8 Nov 2004 04:25:52 -0000	1.1
+++ gl-117.desktop	3 Jul 2008 21:31:29 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=GL-117
 Comment=An action flight similator
-Exec=gl-117
-Icon=gl-117.png
+Exec=gl-117-wrapper
+Icon=gl-117
 Terminal=false
 Type=Application
-Categories=Game;Application;
+Categories=Game;Simulation;
 Encoding=UTF-8


Index: gl-117.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gl-117/F-9/gl-117.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gl-117.spec	20 Feb 2008 02:47:10 -0000	1.11
+++ gl-117.spec	3 Jul 2008 21:31:29 -0000	1.12
@@ -1,9 +1,9 @@
 Name:           gl-117
 Version:        1.3.2
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Action flight simulator
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2
 URL:            http://www.heptargon.de/gl-117/gl-117.htm
 Source0:        http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2
 Source1:        gl-117.desktop
@@ -12,6 +12,7 @@
 BuildRequires:  SDL-devel, SDL_mixer-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  desktop-file-utils
+Requires:       opengl-games-utils
 
 %description
 GL-117 is an action flight simulator. Enter the Eagle Squadron and succeed
@@ -25,35 +26,53 @@
 
 sed -i -e 's/\r//' AUTHORS ChangeLog FAQ NEWS
 
+sed -i -e 's/ -lSDLmain\>//' configure
+
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6
+
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications \
+         $RPM_BUILD_ROOT/%{_datadir}/pixmaps \
+         $RPM_BUILD_ROOT/%{_mandir}/man6
+
 install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-    --add-category X-Fedora \
     --vendor fedora %{SOURCE1}
 
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README doc/%{name}.pdf
-%{_bindir}/*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-wrapper
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man6/*
 
 %changelog
+* Thu Jul 03 2008 Steven Pritchard <steve at kspei.com> 1.3.2-7
+- Fix BZ#304841.
+  - Use opengl-game-wrapper.
+  - Update .desktop file.
+  - Drop "--add-category X-Fedora".
+
+* Thu Jul 03 2008 Steven Pritchard <steve at kspei.com> 1.3.2-6
+- Update License tag.
+- Drop -lSDLmain.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.2-5
 - Autorebuild for GCC 4.3