summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@fedoraproject.org>2007-12-19 11:13:08 +0000
committerMartin Stransky <stransky@fedoraproject.org>2007-12-19 11:13:08 +0000
commitc4be312974dbd1e7850cbb6b208f60110b2cf981 (patch)
treed9c353194382f18dd1998494c3c9e64c7a48516f
parent- moved to XUL Runner and updated to 3.0b3pre (diff)
downloadlibrewolf-fedora-ff-c4be312974dbd1e7850cbb6b208f60110b2cf981.tar.gz
librewolf-fedora-ff-c4be312974dbd1e7850cbb6b208f60110b2cf981.tar.bz2
librewolf-fedora-ff-c4be312974dbd1e7850cbb6b208f60110b2cf981.zip
starting scripts fixes
-rw-r--r--firefox-xremote-client.sh.in2
-rw-r--r--firefox.sh.in10
-rw-r--r--firefox.spec13
3 files changed, 13 insertions, 12 deletions
diff --git a/firefox-xremote-client.sh.in b/firefox-xremote-client.sh.in
index 806810a..d6152c6 100644
--- a/firefox-xremote-client.sh.in
+++ b/firefox-xremote-client.sh.in
@@ -29,4 +29,4 @@ else
fi
export LD_LIBRARY_PATH
-$MOZILLA_FIVE_HOME/firefox-bin -remote "$1"
+$MOZILLA_FIVE_HOME/firefox -remote "$1"
diff --git a/firefox.sh.in b/firefox.sh.in
index 9685712..922752f 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -48,11 +48,11 @@ case $MOZ_ARCH in
;;
esac
-if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
- if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
- echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found"
+if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
+ if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
+ echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
if [ -d $SECONDARY_LIB_DIR ]; then
- echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found"
+ echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
fi
exit 1
fi
@@ -61,7 +61,7 @@ fi
MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
-MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client"
+MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/firefox-xremote-client"
MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
##
diff --git a/firefox.spec b/firefox.spec
index 7c8a898..9b78ba1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,10 +1,11 @@
%define homepage http://start.fedoraproject.org/
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define desktop_file_utils_version 0.9
-%define builddir %{_builddir}/mozilla
-%define mozappdir %{_libdir}/%{name}-3.0b3pre
-%define official_branding 0
+%define internal_version 3.0b3pre
+%define mozappdir %{_libdir}/%{name}-%{internal_version}
+
+%define official_branding 0
Summary: Mozilla Firefox Web browser
Name: firefox
@@ -128,7 +129,7 @@ export LIBDIR='%{_libdir}'
%define moz_make_flags %{?_smp_mflags}
%endif
-INTERNAL_GECKO="3.0b3pre"
+INTERNAL_GECKO=%{internal_version}
MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
export LDFLAGS="-Wl,-rpath,$MOZ_APP_DIR"
@@ -154,12 +155,12 @@ desktop-file-install --vendor mozilla \
# set up the firefox start script
%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
-%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \
+%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{internal_version},g' > \
$RPM_BUILD_ROOT%{_bindir}/firefox
%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
# 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,%{internal_version}-%{release},g' > rh-default-prefs
# set up our default homepage
%{__cat} >> rh-default-prefs << EOF
bgstack15