From 212bbd5a9c865ec03e640bf28eda7b69ba7090da Mon Sep 17 00:00:00 2001
From: Rahul Sundaram <sundaram@fedoraproject.org>
Date: Feb 10 2013 18:09:27 +0000
Subject: remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247


- clean up spec to follow current guidelines

---

diff --git a/arora.spec b/arora.spec
index 85b7986..732dec5 100644
--- a/arora.spec
+++ b/arora.spec
@@ -1,6 +1,6 @@
 Name:           arora
 Version:        0.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
@@ -11,8 +11,6 @@ Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.10.2-fedorahome.patch
 Patch3:         arora-0.11.0-fake-certificate-issuer.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel >= 4.5.0
 BuildRequires:  qt4-webkit-devel
@@ -40,20 +38,10 @@ qmake-qt4 PREFIX=%{_prefix}
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make INSTALL_ROOT=$RPM_BUILD_ROOT install 
-
-# imo, shouldn't add/change upstream vendor here, but changing
-# once released this way is bad too. :(  -- Rex
-desktop-file-install --vendor fedora \
-      --dir $RPM_BUILD_ROOT%{_datadir}/applications\
-      --delete-original\
-      $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
 
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications\
+      $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -69,16 +57,14 @@ fi
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS README ChangeLog
 %doc LICENSE.GPL2 LICENSE.GPL3
 %{_bindir}/arora
 %{_bindir}/arora-placesimport
 %{_bindir}/htmlToXBel
 %{_bindir}/arora-cacheinfo
-%{_datadir}/applications/fedora-%{name}.desktop    
+%{_datadir}/applications/%{name}.desktop    
 %{_datadir}/icons/hicolor/128x128/apps/arora.png
 %{_datadir}/icons/hicolor/16x16/apps/arora.png
 %{_datadir}/icons/hicolor/32x32/apps/arora.png
@@ -89,6 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Sun Feb 10 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 0.11.0-6
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild