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

[paragn]

commit 400b7bc066863d15411598c4a2dab703380db7a5
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Feb 10 11:42:06 2013 +0530

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

 xournal.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/xournal.spec b/xournal.spec
index dde2a85..cda974d 100644
--- a/xournal.spec
+++ b/xournal.spec
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
@@ -8,8 +8,6 @@ License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	gtk2-devel >= 2.10.0
 BuildRequires:	libgnomecanvas-devel >= 2.4.0
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0
@@ -44,7 +42,6 @@ CFLAGS="%optflags -DPACKAGE_LOCALE_DIR=\\\"\"%{_datadir}/locale\"\\\" -DPACKAGE_
 
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 # xournal icons and mime icons
@@ -63,7 +60,7 @@ done
 
 # Desktop entry
 %{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
-desktop-file-install --vendor fedora \
+desktop-file-install \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
 	xournal.desktop
 
@@ -87,18 +84,14 @@ touch --no-create %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 %{_datadir}/icons/hicolor/*x*/mimetypes/application-x-xoj.png
 %{_datadir}/icons/hicolor/*x*/mimetypes/gnome-mime-application-x-xoj.png
 %{_datadir}/pixmaps/xournal.png
-%{_datadir}/applications/fedora-xournal.desktop
+%{_datadir}/applications/xournal.desktop
 %{_datadir}/mime/packages/xournal.xml
 %{_datadir}/mimelnk/application/x-xoj.desktop
 %{_datadir}/xournal/
@@ -107,6 +100,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 0.4.7-2
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Thu Aug 16 2012 Jaromir Capik <jcapik at redhat.com> - 0.4.7-1
 - Update to 0.4.7