rpms/sopwith/devel sopwith.spec,1.10,1.11

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/sopwith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv955

Modified Files:
	sopwith.spec 
Log Message:
* Fri Feb 13 2009 Adrian Reber <adrian at lisas.de> - 1.7.1-7
- replaced %makeinstall with make DESTDIR=... install
- removed X-Fedora category from desktop-file-install
- removed Application category from desktop-file-install (#485354)
- added ArcadeGame category from desktop-file-install (#485354)
- removed ".png" from "Icon=" in desktop file to silence a warning
- fixed "wrong-script-end-of-line-encoding" of readme.txt



Index: sopwith.spec
===================================================================
RCS file: /cvs/extras/rpms/sopwith/devel/sopwith.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sopwith.spec	18 Feb 2008 18:48:14 -0000	1.10
+++ sopwith.spec	13 Feb 2009 08:43:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           sopwith
 Version:        1.7.1
-Release:        6
+Release:        7
 Summary:        SDL port of the sopwith game
 
 Group:          Amusements/Games
@@ -22,6 +22,7 @@
 %prep
 %setup -q -n sdl_sopwith-%{version}
 %patch0 -p1
+sed -i 's/\r//' doc/readme.txt
 
 
 %build
@@ -31,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sopwith
 
 cat > %{name}.desktop <<EOF
@@ -41,13 +42,12 @@
 Comment=The classic sopwith game
 Exec=gtksopwith
 Terminal=false
-Icon=sopwith.png
+Icon=sopwith
 EOF
 
 desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications           \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
+  --add-category ArcadeGame                            \
   --add-category Game                                  \
   %{name}.desktop
 
@@ -70,6 +70,14 @@
 
 
 %changelog
+* Fri Feb 13 2009 Adrian Reber <adrian at lisas.de> - 1.7.1-7
+- replaced %%makeinstall with make DESTDIR=... install
+- removed X-Fedora category from desktop-file-install
+- removed Application category from desktop-file-install (#485354)
+- added ArcadeGame category from desktop-file-install (#485354)
+- removed ".png" from "Icon=" in desktop file to silence a warning
+- fixed "wrong-script-end-of-line-encoding" of readme.txt
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7.1-6
 - Autorebuild for GCC 4.3