rpms/firefox/devel firefox-xremote-client.sh.in, 1.4, 1.5 firefox.sh.in, 1.25, 1.26 firefox.spec, 1.215, 1.216

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18111

Modified Files:
	firefox-xremote-client.sh.in firefox.sh.in firefox.spec 
Log Message:
starting scripts fixes


Index: firefox-xremote-client.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-xremote-client.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefox-xremote-client.sh.in	7 Aug 2007 08:37:27 -0000	1.4
+++ firefox-xremote-client.sh.in	19 Dec 2007 11:13:08 -0000	1.5
@@ -29,4 +29,4 @@
 fi
  export LD_LIBRARY_PATH
 
-$MOZILLA_FIVE_HOME/firefox-bin -remote "$1"
+$MOZILLA_FIVE_HOME/firefox -remote "$1"


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- firefox.sh.in	5 Nov 2007 12:00:37 -0000	1.25
+++ firefox.sh.in	19 Dec 2007 11:13:08 -0000	1.26
@@ -48,11 +48,11 @@
 		;;
 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 @@
 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"
 
 ##


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- firefox.spec	18 Dec 2007 14:33:32 -0000	1.215
+++ firefox.spec	19 Dec 2007 11:13:08 -0000	1.216
@@ -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 @@
 %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 @@
 
 # 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