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

[Rahul Sundaram]

commit f661150d0d8ddfaa09c5dd90d94222fced567d0c
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Thu Feb 14 15:51:52 2013 -0500

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

 centerim.spec |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/centerim.spec b/centerim.spec
index 7dccf56..23a6575 100644
--- a/centerim.spec
+++ b/centerim.spec
@@ -1,6 +1,6 @@
 Name:           centerim
 Version:        4.22.10
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -15,8 +15,6 @@ Source2:        centerim.desktop
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
 Patch1:         centerim-gcc46.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  curl-devel
 BuildRequires:  ncurses-devel >= 4.2
 BuildRequires:  gettext-devel
@@ -42,7 +40,6 @@ CenterIM is a text mode menu- and window-driven IM interface that supports
 the ICQ2000, Yahoo!, MSN, AIM TOC, IRC, Gadu-Gadu and Jabber protocols.
 Internal RSS reader and a client for LiveJournal are provided.
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
@@ -52,7 +49,6 @@ iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
 touch -r ChangeLog ChangeLog.utf8
 mv ChangeLog.utf8 ChangeLog
 
-
 %build
 autoconf
 %configure \
@@ -61,14 +57,11 @@ autoconf
         --enable-locales-fix
 make %{?_smp_flags}
 
-
 %check
 make check
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 %find_lang %{name}
 
 # Remove unnecessary stuff
@@ -78,17 +71,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 # Install Icon and Menu entry
 install -d $RPM_BUILD_ROOT%{_datadir}/icons
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons
-desktop-file-install --vendor=fedora                    \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-        %{SOURCE2}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO
 %{_bindir}/centerim
 %{_bindir}/cimconv
@@ -96,12 +81,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cimextracthistory.pl
 %{_bindir}/CenterIMLog2HTML.py
 %{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/*.svg
 %{_mandir}/man1/*
 
-
 %changelog
+* Thu Feb 14 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 1:4.22.10-10
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild