rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed rhbz#664877 - Cannot read application.ini

Browse Source
This commit is contained in:
Martin Stransky 2011-01-04 13:00:05 +01:00
parent 9019c4cf58
commit 767857cdc5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firefox.sh.in
View File

@ -62,7 +62,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY" MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY"
MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" 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" MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh"
## ##

7
firefox.spec
View File

@ -26,7 +26,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 4.0 Version: 4.0
Release: 0.7%{?prever}%{?dist} Release: 0.8%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -191,7 +191,6 @@ XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,
# Remove binary stub from xulrunner # Remove binary stub from xulrunner
%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/firefox %{__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 # set up our default preferences
%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs %{__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 %endif
%{mozappdir}/icons %{mozappdir}/icons
%{mozappdir}/searchplugins %{mozappdir}/searchplugins
%{mozappdir}/firefox
%{mozappdir}/run-mozilla.sh %{mozappdir}/run-mozilla.sh
%{mozappdir}/application.ini %{mozappdir}/application.ini
%dir %{mozappdir}/modules %dir %{mozappdir}/modules
@ -388,6 +386,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %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 * Tue Dec 21 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.7b8
- Update to Beta 8 - Update to Beta 8
- Fixed rhbz#437608 - When prelink is installed, - Fixed rhbz#437608 - When prelink is installed,