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

starting scripts fixes

Browse Source
This commit is contained in:
Martin Stransky 2007-12-19 11:13:08 +00:00
parent bede30df0b
commit c4be312974
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firefox-xremote-client.sh.in
View File

@ -29,4 +29,4 @@ else
fi fi
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
$MOZILLA_FIVE_HOME/firefox-bin -remote "$1" $MOZILLA_FIVE_HOME/firefox -remote "$1"

10
firefox.sh.in
View File

@ -48,11 +48,11 @@ case $MOZ_ARCH in
;; ;;
esac esac
if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found" echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
if [ -d $SECONDARY_LIB_DIR ]; then 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 fi
exit 1 exit 1
fi fi
@ -61,7 +61,7 @@ fi
MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions" MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" 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" MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
## ##

11
firefox.spec
View File

@ -1,8 +1,9 @@
%define homepage http://start.fedoraproject.org/ %define homepage http://start.fedoraproject.org/
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define desktop_file_utils_version 0.9 %define desktop_file_utils_version 0.9
%define builddir %{_builddir}/mozilla
%define mozappdir %{_libdir}/%{name}-3.0b3pre %define internal_version 3.0b3pre
%define mozappdir %{_libdir}/%{name}-%{internal_version}
%define official_branding 0 %define official_branding 0
@ -128,7 +129,7 @@ export LIBDIR='%{_libdir}'
%define moz_make_flags %{?_smp_mflags} %define moz_make_flags %{?_smp_mflags}
%endif %endif
INTERNAL_GECKO="3.0b3pre" INTERNAL_GECKO=%{internal_version}
MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
export LDFLAGS="-Wl,-rpath,$MOZ_APP_DIR" export LDFLAGS="-Wl,-rpath,$MOZ_APP_DIR"
@ -154,12 +155,12 @@ desktop-file-install --vendor mozilla \
# set up the firefox start script # set up the firefox start script
%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox %{__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 $RPM_BUILD_ROOT%{_bindir}/firefox
%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/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,%{internal_version}-%{release},g' > rh-default-prefs
# set up our default homepage # set up our default homepage
%{__cat} >> rh-default-prefs << EOF %{__cat} >> rh-default-prefs << EOF