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

[Rahul Sundaram]

commit 25e728f0b04d2a50c2f74fa3417f5d1785b45451
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Sat Feb 9 18:51:38 2013 -0500

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

 amsn.spec |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/amsn.spec b/amsn.spec
index 297f64b..b26314c 100644
--- a/amsn.spec
+++ b/amsn.spec
@@ -3,7 +3,7 @@
 
 Name:		amsn
 Version:	0.98.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	MSN Messenger clone for Linux, Mac and Windows
 
 Group:		Applications/Internet
@@ -12,7 +12,6 @@ URL:		http://www.amsn-project.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 Patch0:		amsn-0.98.1-usesnack.patch
 Patch1:		amsn-0.98.9-chrpath.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
 %if 0%{?fedora}	>= 17
@@ -69,10 +68,8 @@ rm plugins/amsnplus/snapshot
 %configure --enable-debug
 make %{?_smp_mflags} V=1
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+%make_install
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn ${RPM_BUILD_ROOT}/%{_bindir}/amsn 
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote-CLI ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote-CLI
@@ -97,29 +94,21 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/skins/Dark\ Matter\ 4.0/pixmapscroll/test.tcl
 chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/utils/voipcontrols/test.tcl
 
-desktop-file-install --vendor="fedora"				\
-	--dir="${RPM_BUILD_ROOT}%{_datadir}/applications"	\
-	--delete-original					\
+desktop-file-install --dir="${RPM_BUILD_ROOT}%{_datadir}/applications"	\
 	${RPM_BUILD_ROOT}%{_datadir}/applications/amsn.desktop
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
 %files
-%defattr(-,root,root,-)
 %doc AGREEMENT CREDITS docs/ FAQ FAQ.html GNUGPL HELP INSTALL README remote.help TODO lang/LANG-HOWTO
 %{_bindir}/amsn
 %{_bindir}/amsn-remote
 %{_bindir}/amsn-remote-CLI
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
-%{_datadir}/applications/fedora-amsn.desktop
+%{_datadir}/applications/amsn.desktop
 %{_datadir}/icons/hicolor/*/*/amsn.png
 %exclude %{_datadir}/%{name}/plugins/*
 
 %files plugins
-%defattr(-,root,root,-)
 %{_datadir}/%{name}/plugins/*
 
 %post
@@ -134,8 +123,11 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-
 %changelog
+* Sat Feb 09 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.98.9-7
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 0.98.9-6
 - rebuild due to "jpeg8-ABI" feature drop