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

[Rahul Sundaram]

commit a7015b16edc655934d366b733f42b79f8184ba90
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Sat Feb 23 22:08:52 2013 -0500

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

 drgeo.spec |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/drgeo.spec b/drgeo.spec
index bd20b49..457359a 100644
--- a/drgeo.spec
+++ b/drgeo.spec
@@ -1,7 +1,7 @@
 Summary: Interactive educational geometry software
 Name: drgeo
 Version: 1.1.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: Applications/Engineering
 URL: http://www.ofset.org/drgeo
@@ -11,13 +11,10 @@ Patch0: drgeo-1.1.0-htmlview.patch
 Patch1: drgeo.patch
 Patch2: drgeo-1.1.0-anonymous-type.patch
 Patch3: drgeo-1.1.0-guile-fixups.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: flex, bison, gmp-devel >= 2.0.2, desktop-file-utils
 BuildRequires: guile-devel, libglade2-devel, intltool, gettext
 
-Obsoletes: drgenius
-
 %description
 Dr. Geo is an interactive geometry GUI application. It allows one to create
 geometric figures plus the interactive manipulation of such figure in
@@ -36,14 +33,10 @@ situation with students from primary or secondary level.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-%makeinstall
+%make_install
 %find_lang %{name}
-perl -pi -e 's/^Icon=gnome-drgenius.png/Icon=drgeo.png/g' %{buildroot}%{_datadir}/applications/drgeo.desktop
+perl -pi -e 's/^Icon=gnome-drgenius.png/Icon=drgeo/g' %{buildroot}%{_datadir}/applications/drgeo.desktop
 desktop-file-install \
-   --delete-original \
-   --vendor=fedora   \
-   --add-category X-Fedora \
    --dir %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/applications/drgeo.desktop
 
@@ -53,20 +46,20 @@ mv %{buildroot}%{_datadir}/texmacs/TeXmacs/plugins/ %{buildroot}%{_datadir}/TeXm
 rmdir %{buildroot}%{_datadir}/texmacs/TeXmacs/
 rmdir %{buildroot}%{_datadir}/texmacs/
 
-%clean
-rm -rf %{buildroot}
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/drgeo
 %{_bindir}/tm_drgeo
 %{_datadir}/drgeo/
 %{_datadir}/pixmaps/*.png
 %{_datadir}/TeXmacs/plugins/drgeo
-%{_datadir}/applications/fedora-drgeo.desktop
+%{_datadir}/applications/drgeo.desktop
 
 %changelog
+* Sat Feb 23 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-24
+- 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.1.0-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild