[dxcc] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247

[Rahul Sundaram]

commit 5f5b34672f9b1329ed4b980100d5148267508976
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Sun Feb 24 21:28:46 2013 -0500

    remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
    
    - clean up spec to follow current guidelines
    - fix desktop file to follow specification

 dxcc.desktop |    1 -
 dxcc.spec    |   26 ++++++++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/dxcc.desktop b/dxcc.desktop
index 129e7eb..e8e7075 100644
--- a/dxcc.desktop
+++ b/dxcc.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=dxcc
 GenericName=dxcc
 Comment=Small utility which determines the ARRL DXCC entity of a ham radio callsign
diff --git a/dxcc.spec b/dxcc.spec
index 234d547..62668e2 100644
--- a/dxcc.spec
+++ b/dxcc.spec
@@ -1,6 +1,6 @@
 Name:           dxcc
 Version:        20080225
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Small utility which determines the ARRL DXCC entity of a ham radio callsign
 
 Group:          Applications/Communications
@@ -16,11 +16,8 @@ Patch0:         dxcc-20071205-makefile.patch
 #separate core and gui
 Patch1:         dxcc-20071205-gui.patch
 
-
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,39 +45,32 @@ radio callsign, based on the cty.dat country file by Jim Reisert, AD1C.
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # 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" \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
-# --vendor obsolete per new guidlines but leaving it in because
-# this is an existing package with vendor previously installed
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/%{name}
 
 %files gui
-%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}-gui
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
 
-
 %changelog
+* Sun Feb 24 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 20080225-18
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+- fix desktop file to follow specification
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080225-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild