From 8795fa2b480dfa29ed690c98384d6b6c983af512 Mon Sep 17 00:00:00 2001
From: Parag Nemade <paragn@fedoraproject.org>
Date: Feb 09 2013 16:30:17 +0000
Subject: Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077


- Cleanup spec as per recently changed packaging guidelines

---

diff --git a/vym.spec b/vym.spec
index 848bce0..cb9774d 100644
--- a/vym.spec
+++ b/vym.spec
@@ -1,7 +1,7 @@
-%define __requires_exclude .*BugzillaClient.*
+%global __requires_exclude .*BugzillaClient.*
 Name:           vym
 Version:        2.3.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        View your mind
 
 Group:          Applications/Productivity
@@ -21,8 +21,6 @@ Source7:	vym-logo-new-48.png
 Source8:	vym-logo-new-256.png
 #Patch0:		vym-2.0.6-gcc470.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  qt4-devel libXext-devel desktop-file-utils
 
 %{?filter_setup:
@@ -53,12 +51,11 @@ qmake-qt4 DOCDIR="%{_docdir}/%{name}-%{version}" PREFIX=%{_prefix}
 
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} install INSTALL_ROOT=%{buildroot} COPY="%{__cp} -p -f"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications/
 
-desktop-file-install --vendor fedora               \
+desktop-file-install             \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
@@ -87,9 +84,6 @@ install -m a+rx,u+w -d %{buildroot}%{_datadir}/mime/packages
 install -p -m a+r,u+w %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/vym.xml
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %post 
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -107,11 +101,10 @@ fi
 update-desktop-database &> /dev/null || :
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt README.txt INSTALL.txt demos/* doc/*
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}*
 %{_datadir}/icons/hicolor/22x22/apps/%{name}*
 %{_datadir}/icons/hicolor/24x24/apps/%{name}*
@@ -122,6 +115,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Feb 09 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 2.3.11-2
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Thu Jan 03 2013 Jon Ciesla <limburgher@gmail.com> - 2.3.11-1
 - Latest upstream, BZ 890428.