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

[Rahul Sundaram]

commit 9bcc544feb7565751ccec66cab4bf179867c0232
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Sun Feb 10 17:23:41 2013 -0500

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

 audacity.spec |   34 ++++++++--------------------------
 1 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/audacity.spec b/audacity.spec
index ac2a6ad..6f2517c 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -4,7 +4,7 @@
 Name: audacity
 
 Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -27,7 +27,6 @@ Patch2: audacity-1.3.9-libdir.patch
 # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
 Patch3: audacity-2.0.2-desktop.in.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: expat-devel
@@ -52,7 +51,6 @@ BuildRequires: zlib-devel
 BuildRequires: wxGTK-devel
 %{?_with_mp3:BuildRequires: libmad-devel}
 
-
 %description
 Audacity is a cross-platform multitrack audio editor. It allows you to
 record sounds directly or to import files in various formats. It features
@@ -60,21 +58,17 @@ a few simple effects, all of the editing features you should need, and
 unlimited undo. The GUI was built with wxWidgets and the audio I/O
 supports OSS and ALSA under Linux.
 
-
 %package manual
 Summary: manual for Audacity - offline install
 
-
 # -manual suits either audacity or audacity-freeworld; both create the path:
 Requires: /usr/bin/audacity
 
-
 %description manual
 Audacity Manual can be installed locally if preferred, or accessed on-line
 if internet connection is available.
 For the most up to date manual content, use the on-line manual.
 
-
 %prep
 %setup -q -n %{tartopdir}
 
@@ -121,9 +115,7 @@ make
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-
-make DESTDIR=${RPM_BUILD_ROOT} install
+%make_install
 
 # Audacity 1.3.8-beta complains if the help/manual directories
 # don't exist.
@@ -131,35 +123,23 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
 
 %{find_lang} %{realname}
 
-desktop-file-install \
-    --vendor fedora \
-    --delete-original \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
-
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
 
 # audacity manual must be unzipped to correct location
 unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}
 
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
 %post
 umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
-
 %postun
 umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
-
 %files -f %{realname}.lang
-%defattr(-,root,root,-)
 %{_bindir}/%{realname}
 %dir %{_datadir}/%{realname}
 %{_datadir}/%{realname}/EQDefaultCurves.xml
@@ -172,12 +152,14 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/mime/packages/*
 %doc %{_datadir}/doc/*
 
-
 %files manual
 %{_datadir}/%{realname}/help/
 
-
 %changelog
+* Sun Feb 10 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 2.0.2-3
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Tue Sep 04 2012 Dan Horák <dan[at]danny.cz> - 2.0.2-2
 - fix build on non-x86 arches