[Fedora-spins] [spin-kickstarts] Adapt to firefox desktop file name change in F17

[Kalev Lember]

commit 9d017bd59a64dc55c84acb54f0ae09777ea7c6f8
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Mar 30 17:15:41 2012 +0300

    Adapt to firefox desktop file name change in F17
    
    Starting with firefox-7.0.1-3.fc17, the desktop file was renamed from
    mozilla-firefox.desktop -> firefox.desktop.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=736558
    https://bugzilla.redhat.com/show_bug.cgi?id=808497

 fedora-live-desktop.ks        |    2 +-
 fedora-livecd-design-suite.ks |    2 +-
 fedora-livecd-lxde.ks         |    2 +-
 fedora-livecd-meego.ks        |    2 +-
 fedora-livecd-security.ks     |    2 +-
 fedora-livedvd-robotics.ks    |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 67ca020..54a4708 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -54,7 +54,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'anaconda.desktop']
 FOE
 
 fi
diff --git a/fedora-livecd-design-suite.ks b/fedora-livecd-design-suite.ks
index 40428ec..03dd77a 100644
--- a/fedora-livecd-design-suite.ks
+++ b/fedora-livecd-design-suite.ks
@@ -100,7 +100,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'inkscape-course.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'inkscape-course.desktop', 'anaconda.desktop']
 FOE
 
   # add installer to user menu
diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks
index e42ac24..47d9216 100644
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@@ -142,7 +142,7 @@ FOE
 # set up preferred apps 
 cat > /etc/xdg/libfm/pref-apps.conf << FOE 
 [Preferred Applications]
-WebBrowser=mozilla-firefox.desktop
+WebBrowser=firefox.desktop
 MailClient=redhat-sylpheed.desktop
 FOE
 
diff --git a/fedora-livecd-meego.ks b/fedora-livecd-meego.ks
index 38f2c5d..f0aa45d 100644
--- a/fedora-livecd-meego.ks
+++ b/fedora-livecd-meego.ks
@@ -61,7 +61,7 @@ FOE
 # Add favourite apps to MyZone
 mkdir -p /etc/skel/.local/share/
 cat > /etc/skel/.local/share/favourite-apps << FOE
-file:///usr/share/applications/moblin-app-installer.desktop file:///usr/share/applications/anjal.desktop file:///usr/share/applications/mozilla-firefox.desktop file:///usr/share
+file:///usr/share/applications/moblin-app-installer.desktop file:///usr/share/applications/anjal.desktop file:///usr/share/applications/firefox.desktop file:///usr/share
 /applications/fedora-empathy.desktop file:///usr/share/applications/hornsey.desktop file:///usr/share/applications/fedora-dates.desktop file:///usr/share/applications/fedora-con
 tacts.desktop file:///usr/share/applications/fedora-tasks.desktop
 FOE
diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index d919c1a..153508e 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -343,7 +343,7 @@ FOE
 # set up preferred apps 
 cat > /etc/xdg/libfm/pref-apps.conf << FOE 
 [Preferred Applications]
-WebBrowser=mozilla-firefox.desktop
+WebBrowser=firefox.desktop
 MailClient=redhat-sylpheed.desktop
 FOE
 
diff --git a/fedora-livedvd-robotics.ks b/fedora-livedvd-robotics.ks
index 77a7814..c5651b8 100644
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
@@ -114,7 +114,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['mozilla-firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE
 
 fi