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

[paragn]

commit 32b70d323213229c1941f26cb4e4fc1e7d87e33a
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Feb 10 22:43: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

 xawtv.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/xawtv.spec b/xawtv.spec
index d285abb..50bdb36 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -4,7 +4,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.101
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://git.linuxtv.org/xawtv3.git
@@ -32,7 +32,6 @@ BuildRequires: libv4l-devel
 
 Requires: usermode xorg-x11-fonts-misc
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -65,8 +64,6 @@ make verbose=yes
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install
 
 %if %{without motif}
@@ -81,7 +78,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/showqt
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -p -m 0644 contrib/xawtv*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
-desktop-file-install --vendor fedora		\
+desktop-file-install 	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications	\
   %{SOURCE1}
  
@@ -107,18 +104,14 @@ SESSION=true
 USER=root
 PROGRAM=%{_sbindir}/v4l-conf
 !
-install -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/v4l-conf
+install -p -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/v4l-conf
 
 mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/
 ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
 
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 
 %files
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/pam.d/v4l-conf
 %config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf
 %{_bindir}/*
@@ -140,6 +133,10 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.101-7
+- 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> - 3.101-6
 - rebuild due to "jpeg8-ABI" feature drop