diff options
| author | Remi Collet <fedora@famillecollet.com> | 2010-06-10 21:31:16 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2010-06-10 21:31:16 +0200 |
| commit | e3872cdaf1715e0245a77b64101e053f936d5306 (patch) | |
| tree | 8d96328cf1251dc6ed3c69534938bb2ff67511a8 | |
| parent | 2a2219ffea3efe3cefe32a058258b03243c03646 (diff) | |
F12 build + fix path again
| -rw-r--r-- | firefox.spec | 13 | ||||
| -rw-r--r-- | firefox36.sh.in | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/firefox.spec b/firefox.spec index bf5c3ad..a994480 100644 --- a/firefox.spec +++ b/firefox.spec @@ -3,7 +3,7 @@ %define cairo_version 1.8.8 %define lcms_version 1.18 %define freetype_version 2.1.9 -%define sqlite_version 3.6.16 +%define sqlite_version 3.6.22 %define homepage http://start.fedoraproject.org/ %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html @@ -30,7 +30,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 3.6.4 -Release: 0.3.build6%{?dist} +Release: 0.4.build6%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -101,7 +101,7 @@ BuildRequires: wireless-tools-devel %endif # BR from Xulrunner -%if %{fedora} >= 11 +%if %{fedora} >= 13 BuildRequires: sqlite-devel >= %{sqlite_version} %endif %if %{fedora} >= 11 @@ -183,7 +183,7 @@ cat <<EOF_MOZCONFIG | tee .mozconfig #ac_add_options --with-system-png ac_add_options --prefix="\$PREFIX" ac_add_options --libdir="\$LIBDIR" -%if %{fedora} >= 11 +%if %{fedora} >= 13 ac_add_options --enable-system-sqlite %endif %if %{fedora} >= 11 @@ -507,6 +507,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Jun 29 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.4.build6 +- F12 build +- fix sqlite dependency (3.6.22) +- fix path for mozilla-xremote-client in launcher + * Sat May 29 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.3.build6 - update to Firefox 3.6.4 Beta (build6) diff --git a/firefox36.sh.in b/firefox36.sh.in index 0d09000..b1190e0 100644 --- a/firefox36.sh.in +++ b/firefox36.sh.in @@ -60,7 +60,7 @@ if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then fi MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" ## firefox DIR for remi -MOZ_XUL_DIR="MOZ_DIST_BIN" +MOZ_XUL_DIR="$MOZ_DIST_BIN" 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" |