rpms/firefox/devel firefox.sh.in,1.39,1.40 firefox.spec,1.363,1.364

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29599

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
Fixed multilib conflict


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- firefox.sh.in	24 Feb 2010 13:55:11 -0000	1.39
+++ firefox.sh.in	12 Apr 2010 10:53:15 -0000	1.40
@@ -59,7 +59,7 @@ if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_V
     MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
 fi
 MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
-MOZ_XUL_DIR="XULRUNNER_DIRECTORY"
+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/firefox"


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -p -r1.363 -r1.364
--- firefox.spec	6 Apr 2010 06:59:58 -0000	1.363
+++ firefox.spec	12 Apr 2010 10:53:15 -0000	1.364
@@ -24,7 +24,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.6.3
-Release:        2%{?prever}%{?dist}
+Release:        3%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -161,8 +161,9 @@ desktop-file-install --vendor mozilla \
 
 # 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,FIREFOX_VERSION,%{internal_version},g' \
-		     | %{__sed} -e "s,XULRUNNER_DIRECTORY,`pkg-config --variable=libdir libxul`,g" > \
+		     | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
   $RPM_BUILD_ROOT%{_bindir}/firefox
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
 
@@ -351,6 +352,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 12 2010 Martin Stransky <stransky at redhat.com> - 3.6.3-3
+- Fixed multilib conflict
+
 * Tue Apr 6 2010 Martin Stransky <stransky at redhat.com> - 3.6.3-2
 - Fixed install dir