[firefox/f15] * Mon Oct 24 2011 Martin Stransky <stransky at redhat.com> - 7.0.1-2 - renamed mozilla-firefox.desktop

[Martin Stransky]

commit d7e5f11b8144ca50fe0b7d0169fbc94228ba6bf1
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Oct 24 15:17:14 2011 +0200

    * 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)

 firefox-redhat-default-prefs.js |    1 +
 firefox.spec                    |   10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index 68adda6..a3f2e4c 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -7,3 +7,4 @@ pref("browser.download.folderList",         1);
 pref("browser.link.open_external",          3);
 pref("browser.shell.checkDefaultBrowser",   false);
 pref("network.manage-offline-status",       true);
+pref("dom.ipc.plugins.enabled.nswrapper*",  false);
\ No newline at end of file
diff --git a/firefox.spec b/firefox.spec
index 2118d80..ad04745 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -44,7 +44,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        7.0.1
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -206,7 +206,7 @@ DESTDIR=$RPM_BUILD_ROOT make install
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-desktop-file-install --vendor mozilla \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE20} 
 
@@ -300,7 +300,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/mozilla-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %dir %{mozappdir}
 %doc %{mozappdir}/LICENSE
 %doc %{mozappdir}/README.txt
@@ -340,6 +340,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* 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)
+
 * Fri Sep 30 2011 Jan Horak <jhorak at redhat.com> - 7.0.1-1
 - Update to 7.0.1