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

paragn paragn at fedoraproject.org
Sun Feb 10 04:57:21 UTC 2013


commit f0f7be692baafeb418fe777ec6b48ab5bf9a6743
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Feb 10 10:29:02 2013 +0530

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

 xarchon.spec |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/xarchon.spec b/xarchon.spec
index 9ff0bb7..db5fa72 100644
--- a/xarchon.spec
+++ b/xarchon.spec
@@ -1,6 +1,6 @@
 Name:           xarchon
 Version:        0.50
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Arcade board game
 Group:          Amusements/Games
 License:        GPL+
@@ -11,7 +11,6 @@ Patch0:         %{name}-fonts.patch
 Patch1:         %{name}-destdir.patch
 Patch2:         http://ftp.debian.org/debian/pool/main/x/%{name}/%{name}_0.50-10.1.diff.gz
 Patch3:         xarchon-0.50-gcc43.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel esound-devel libXpm-devel
 BuildRequires:  desktop-file-utils ImageMagick
 Requires:       hicolor-icon-theme
@@ -35,12 +34,11 @@ convert data/icon.xpm %{name}.png
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
+desktop-file-install      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
@@ -48,10 +46,6 @@ install -p -m 644 %{name}.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -66,16 +60,19 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man6/%{name}.6.gz
 
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 0.50-14
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.50-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list