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

paragn paragn at fedoraproject.org
Sun Feb 10 09:42:51 UTC 2013


commit f6c2e0ace6cea72d5443047f0cdb59c6032f72f9
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Feb 10 15:14:41 2013 +0530

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

 xfhell.spec |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/xfhell.spec b/xfhell.spec
index 0c0619c..ca0eeb9 100644
--- a/xfhell.spec
+++ b/xfhell.spec
@@ -1,6 +1,6 @@
 Name:           xfhell
 Version:        1.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        GTK based Ham Radio application for the Hellschreiber communications mode
 
 Group:          Applications/Communications
@@ -11,7 +11,6 @@ Source0:        http://5b4az.chronos.org.uk/pkg/%{name}/%{name}-%{version}.tar.g
 Source1:        %{name}.desktop
 #temporary Icon
 Source2:        %{name}.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, automake, gtk2-devel, desktop-file-utils
 #Requires:       
@@ -32,29 +31,28 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS=" -lm"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # no upstream .desktop or icon yet
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
-cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor="fedora" \
+cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
 #Missing copy of the GPL, Notified upstream
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README
 %doc doc/BDF_Spec.pdf doc/xfhell.html
 %{_bindir}/*
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.9-10
+- 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> - 1.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list