summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2011-01-04 13:00:05 +0100
committerMartin Stransky <stransky@redhat.com>2011-01-04 13:00:05 +0100
commit767857cdc5009438b3430c1caf0cd2db0cad913b (patch)
treeb6411f26494bded20d0d1317897fb7250a40769a
parentbuild fixes (diff)
downloadlibrewolf-fedora-ff-767857cdc5009438b3430c1caf0cd2db0cad913b.tar.gz
librewolf-fedora-ff-767857cdc5009438b3430c1caf0cd2db0cad913b.tar.bz2
librewolf-fedora-ff-767857cdc5009438b3430c1caf0cd2db0cad913b.zip
Fixed rhbz#664877 - Cannot read application.ini
-rw-r--r--firefox.sh.in2
-rw-r--r--firefox.spec7
2 files changed, 5 insertions, 4 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index 96c46a9..fd5ab10 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -62,7 +62,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY"
MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-MOZ_PROGRAM="$MOZ_DIST_BIN/firefox -app $MOZ_DIST_BIN/application.ini"
+MOZ_PROGRAM="/usr/bin/xulrunner $MOZ_DIST_BIN/application.ini"
MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh"
##
diff --git a/firefox.spec b/firefox.spec
index 553819c..4cbd623 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -26,7 +26,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 4.0
-Release: 0.7%{?prever}%{?dist}
+Release: 0.8%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -191,7 +191,6 @@ XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,
# Remove binary stub from xulrunner
%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/firefox
-ln -s `pkg-config --variable=libdir libxul`/xulrunner-stub $RPM_BUILD_ROOT/%{mozappdir}/firefox
# set up our default preferences
%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs
@@ -354,7 +353,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%{mozappdir}/icons
%{mozappdir}/searchplugins
-%{mozappdir}/firefox
%{mozappdir}/run-mozilla.sh
%{mozappdir}/application.ini
%dir %{mozappdir}/modules
@@ -388,6 +386,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Tue Jan 4 2011 Martin Stransky <stransky@redhat.com> - 4.0-0.8b8
+- Fixed rhbz#664877 - Cannot read application.ini
+
* Tue Dec 21 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.7b8
- Update to Beta 8
- Fixed rhbz#437608 - When prelink is installed,
bgstack15