diff options
| author | Martin Stransky <stransky@redhat.com> | 2014-01-09 14:26:22 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2014-01-09 14:26:22 +0100 |
| commit | 58dcc7950fb0ab5322ef0a216f6f51ece615d5c3 (patch) | |
| tree | 8041b0d06f52ff45bd4c56489488b4a25ce87e64 | |
| parent | fixed changelog and bump release (diff) | |
| download | librewolf-fedora-ff-58dcc7950fb0ab5322ef0a216f6f51ece615d5c3.tar.gz librewolf-fedora-ff-58dcc7950fb0ab5322ef0a216f6f51ece615d5c3.tar.bz2 librewolf-fedora-ff-58dcc7950fb0ab5322ef0a216f6f51ece615d5c3.zip | |
Install script fixes
| -rw-r--r-- | firefox.sh.in | 5 | ||||
| -rw-r--r-- | firefox.spec | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/firefox.sh.in b/firefox.sh.in index 00c33c4..7572fe9 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -61,7 +61,6 @@ if [ ! -r $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then MOZ_LIB_DIR="$SECONDARY_LIB_DIR" fi MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox" -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/$MOZ_FIREFOX_FILE" @@ -172,9 +171,9 @@ FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install" # MOZ_DISABLE_LANGPACKS disables language packs completely MOZILLA_DOWN=0 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then - if [ -x $MOZ_XUL_DIR/mozilla-xremote-client ]; then + if [ -x $MOZ_LIB_DIR/mozilla-xremote-client ]; then # Is firefox running? - $MOZ_XUL_DIR/mozilla-xremote-client -a firefox 'ping()' > /dev/null 2>&1 + $MOZ_LIB_DIR/mozilla-xremote-client -a firefox 'ping()' > /dev/null 2>&1 MOZILLA_DOWN=$? fi fi diff --git a/firefox.spec b/firefox.spec index b5c6d79..63a834f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -326,6 +326,10 @@ echo "ac_add_options --disable-tracejit" >> .mozconfig echo "ac_add_options --disable-webrtc" >> .mozconfig %endif +%if !%{enable_mozilla_crashreporter} +echo "ac_add_options --disable-crashreporter" >> .mozconfig +%endif + #--------------------------------------------------------------------- %build @@ -422,14 +426,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20} # set up the firefox start script %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox -XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir}/\?,,g"` -%{__cat} %{SOURCE21} | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \ - $RPM_BUILD_ROOT%{_bindir}/firefox +%{__cat} %{SOURCE21} > $RPM_BUILD_ROOT%{_bindir}/firefox %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox -# Link with xulrunner -ln -s `pkg-config --variable=libdir libxul` $RPM_BUILD_ROOT/%{mozappdir}/xulrunner - %{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1 %{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/firefox-config @@ -462,7 +461,6 @@ for langpack in `ls firefox-langpacks/*.xpi`; do echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> ../%{name}.lang done %{__rm} -rf firefox-langpacks -%endif # build_langpacks # Install langpack workaround (see #707100, #821169) function create_default_langpack() { @@ -489,6 +487,7 @@ create_default_langpack "pa-IN" "pa" create_default_langpack "pt-PT" "pt" create_default_langpack "sv-SE" "sv" create_default_langpack "zh-TW" "zh" +%endif # build_langpacks # Keep compatibility with the old preference location # on Fedora 18 and earlier |