[firefox] application.ini permission check fix

Martin Stransky stransky at fedoraproject.org
Thu Jan 6 09:36:22 UTC 2011


commit 1c699fa97d42b453c0246489491c12d5d0572924
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Thu Jan 6 10:36:09 2011 +0100

    application.ini permission check fix

 firefox.sh.in |    4 ++--
 firefox.spec  |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/firefox.sh.in b/firefox.sh.in
index cb6373b..6b339e7 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -50,8 +50,8 @@ esac
 
 MOZ_FIREFOX_FILE="application.ini"
 
-if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
-    if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
+if [ ! -r $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
+    if [ ! -r $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
 	echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found"
 	if [ -d $SECONDARY_LIB_DIR ]; then
 	    echo "       $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found"
diff --git a/firefox.spec b/firefox.spec
index 0171096..2aa0fd1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -26,7 +26,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        4.0
-Release:        0.9%{?prever}%{?dist}
+Release:        0.10%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -386,6 +386,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jan 6 2011 Martin Stransky <stransky at redhat.com> - 4.0-0.10b8
+- application.ini permission check fix
+
 * Tue Jan 6 2011 Martin Stransky <stransky at redhat.com> - 4.0-0.9b8
 - Fixed rhbz#667477 - broken launch script
 


More information about the scm-commits mailing list