[xmoto] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077

paragn paragn at fedoraproject.org
Sun Feb 10 05:40:32 UTC 2013


commit 380b3bc71db2ef9c2b57c713993f74d568861322
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Feb 10 11:12:04 2013 +0530

    Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
    
    - Cleanup spec as per recently changed packaging guidelines

 xmoto.spec |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/xmoto.spec b/xmoto.spec
index 5db7a3f..042ac09 100644
--- a/xmoto.spec
+++ b/xmoto.spec
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.5.10
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -22,7 +22,6 @@ Patch9:		xmoto-0.5.0-helpers-log-include.patch
 #Patch10:	xmoto-0.5.2-x86-64.patch
 #Patch11:	xmoto-0.5.8-libpng15.patch
 Patch12:	xmoto-0.5.9-gcc470.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	SDL_mixer-devel
@@ -86,18 +85,17 @@ chmod -x src/*/*/*.h
 
 %build
 %configure --with-enable-zoom=1
-make
+make %{_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Install icon and desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
-desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --add-category X-Fedora %{SOURCE1}
+desktop-file-install  --dir $RPM_BUILD_ROOT%{_datadir}/applications --add-category X-Fedora %{SOURCE1}
 
 rm $RPM_BUILD_ROOT%{_datadir}/xmoto/Textures/Fonts/DejaVuSans.ttf 
 ln -s ../../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/xmoto/Textures/Fonts/DejaVuSans.ttf 
@@ -105,10 +103,6 @@ ln -s ../../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/xmoto/Text
 # Locale files
 %find_lang %{name} %{name}.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then 
@@ -122,15 +116,18 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
 %{_datadir}/xmoto
-%{_datadir}/applications/fedora-xmoto.desktop
+%{_datadir}/applications/xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 0.5.10-6
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 0.5.10-5
 - rebuild due to "jpeg8-ABI" feature drop
 


More information about the scm-commits mailing list