From bbd8d4849b770fd24a1ceef6bbfc5f91964942db Mon Sep 17 00:00:00 2001
From: Parag Nemade <paragn@fedoraproject.org>
Date: Feb 10 2013 04:36:34 +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/xdrawchem.spec b/xdrawchem.spec
index 2d11fa5..52cdd08 100644
--- a/xdrawchem.spec
+++ b/xdrawchem.spec
@@ -1,6 +1,6 @@
 Name: 		xdrawchem
 Version: 	1.9.9
-Release: 	21%{?dist}
+Release: 	22%{?dist}
 Summary: 	2D chemical structures drawing tool
 Source0:	http://downloads.sourceforge.net/sourceforge/xdrawchem/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
@@ -11,7 +11,6 @@ Patch3:		%{name}-include-header.patch
 URL: 		http://xdrawchem.sourceforge.net/
 License: 	GPLv2+
 Group: 		Applications/Engineering
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	qt3-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	openbabel-devel
@@ -39,19 +38,17 @@ XDrawChem and other chemistry applications.
 %{__make} %{?_smp_mflags}
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # menu
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -Dpm 644 ring/xdrawchem-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xdrawchem.png
-desktop-file-install --vendor fedora \
+desktop-file-install \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	%{SOURCE1}
 rm -f $RPM_BUILD_ROOT%{_datadir}/xdrawchem/caslist.txt
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -66,14 +63,17 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
-%defattr(644,root,root,755)
 %doc HISTORY.txt GPL.txt README.txt TODO.txt
 %attr(755,root,root) %{_bindir}/xdrawchem
 %{_datadir}/xdrawchem
-%{_datadir}/applications/*xdrawchem.desktop
+%{_datadir}/applications/xdrawchem.desktop
 %{_datadir}/icons/hicolor/*/apps/xdrawchem.png
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.9.9-22
+- 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> - 1.9.9-21
 - rebuild due to "jpeg8-ABI" feature drop