[firefox/f15] * Mon Oct 24 2011 Martin Stransky <stransky at redhat.com> - 7.0.1-3 - reverted the desktop file name f

[Martin Stransky]

commit 26608097b00a74bbd4cda9d12162b526b4567fb6
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Oct 24 16:31:34 2011 +0200

    * Mon Oct 24 2011 Martin Stransky <stransky at redhat.com> - 7.0.1-3
    - reverted the desktop file name for Fedora15 & 16

 firefox.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/firefox.spec b/firefox.spec
index ad04745..a7b0a40 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -44,7 +44,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        7.0.1
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -206,9 +206,11 @@ DESTDIR=$RPM_BUILD_ROOT make install
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE20} 
+%if 0%{?fedora} <= 16
+desktop-file-install --vendor mozilla --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
+%else
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
+%endif
 
 # set up the firefox start script
 %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
@@ -300,7 +302,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc %{_mandir}/man1/*
 %dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
 %dir %{_libdir}/mozilla/extensions/%{firefox_app_id}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*.desktop
 %dir %{mozappdir}
 %doc %{mozappdir}/LICENSE
 %doc %{mozappdir}/README.txt
@@ -340,6 +342,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 24 2011 Martin Stransky <stransky at redhat.com> - 7.0.1-3
+- reverted the desktop file name for Fedora15 & 16
+
 * Mon Oct 24 2011 Martin Stransky <stransky at redhat.com> - 7.0.1-2
 - renamed mozilla-firefox.desktop to firefox.desktop (#736558)
 - nspluginwrapper is not run in plugin-container (#747981)