diff options
| author | Martin Stransky <stransky@fedoraproject.org> | 2010-04-12 10:53:15 +0000 |
|---|---|---|
| committer | Martin Stransky <stransky@fedoraproject.org> | 2010-04-12 10:53:15 +0000 |
| commit | 84634ca6eae1e6ed06e644ee47c160acd39fe9a6 (patch) | |
| tree | 67dc5c57595519a848217f272608df2e6e717a3d | |
| parent | Fixed install dir (diff) | |
| download | librewolf-fedora-ff-84634ca6eae1e6ed06e644ee47c160acd39fe9a6.tar.gz librewolf-fedora-ff-84634ca6eae1e6ed06e644ee47c160acd39fe9a6.tar.bz2 librewolf-fedora-ff-84634ca6eae1e6ed06e644ee47c160acd39fe9a6.zip | |
Fixed multilib conflict
| -rw-r--r-- | firefox.sh.in | 2 | ||||
| -rw-r--r-- | firefox.spec | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/firefox.sh.in b/firefox.sh.in index 9c160d8..9a26458 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -59,7 +59,7 @@ if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then 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" diff --git a/firefox.spec b/firefox.spec index 83fc259..e6aefee 100644 --- a/firefox.spec +++ b/firefox.spec @@ -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/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Apr 12 2010 Martin Stransky <stransky@redhat.com> - 3.6.3-3 +- Fixed multilib conflict + * Tue Apr 6 2010 Martin Stransky <stransky@redhat.com> - 3.6.3-2 - Fixed install dir |