Update to 4.0 Beta 6, Disabled langpacks for now

4 files changed, 18 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index ca47c4a..fc7d821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ firefox-langpacks-3.6.4-20100622.tar.bz2
 firefox-3.6.4.source.tar.bz2
 /firefox-4.0b4.source.tar.bz2
 /firefox-langpacks-4.0b4-20100830.tar.bz2
+/firefox-4.0b6.source.tar.bz2
+/firefox-langpacks-4.0b6-20100921.tar.bz2
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 654a360..d081ddd 100755
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -34,4 +34,4 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
diff --git a/firefox.spec b/firefox.spec
index d2b97ad..4de4066 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -2,7 +2,7 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
-%global internal_version	4.0
+%global internal_version	4
 
 # This is a bit of a hack, but the tabview files have to be in the xulrunner_libdir
 %{!?xulrunner_libdir: %global xulrunner_libdir %(pkg-config --variable=libdir libxul)}
@@ -12,29 +12,29 @@
 
 # xulrunner_version matches the firefox package.
 # xulrunner_version_max is first next incompatible xulrunner version
-%define xulrunner_version       1.9.3.0
-%define xulrunner_version_max   1.9.3.1
+%define xulrunner_version       2.0-0.1b6
+%define xulrunner_version_max   2.1
 
 %define official_branding       0
-%define build_langpacks         1
+%define build_langpacks         0
 %define include_debuginfo       0
 
 %if ! %{official_branding}
 %define cvsdate 20080327
 %define nightly .cvs%{cvsdate}
-%define prever  b4
+%define prever  b6
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        4.0
-Release:        0.2%{?prever}%{?dist}
+Release:        0.3%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?prever}/source/firefox-%{version}%{?prever}.source.tar.bz2
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}%{?prever}-20100830.tar.bz2
+Source2:        firefox-langpacks-%{version}%{?prever}-20100921.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -366,7 +366,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{mozappdir}/defaults
 %dir %{mozappdir}/extensions
 %{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%if %{build_langpacks}
 %dir %{mozappdir}/langpacks
+%endif
 %{mozappdir}/icons
 %{mozappdir}/searchplugins
 %{mozappdir}/firefox
@@ -399,6 +401,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 21 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.3.b6
+- Update to 4.0 Beta 6
+- Disabled langpacks for now
+
 * Tue Sep  7 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.0-0.2.b4
 - get package building and mostly functional
 
diff --git a/sources b/sources
index fe230b2..505a8c5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
 8084d2b273e8c9fb444acd99e51ea904  firefox-4.0b4.source.tar.bz2
 830173d861fcabe6a74299b28b40339d  firefox-langpacks-4.0b4-20100830.tar.bz2
+444176a2fd04f20512da121d1afa8abb  firefox-4.0b6.source.tar.bz2
+26d5cbe070ffd7fbf4a5f1c57722c3f7  firefox-langpacks-4.0b6-20100921.tar.bz2