Update to 3.6

3 files changed, 31 insertions, 18 deletions

diff --git a/.cvsignore b/.cvsignore
index 389abaf..d166a46 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,5 @@ firefox-3.5.4-source.tar.bz2
 firefox-langpacks-3.5.4-20091026.tar.bz2
 firefox-3.5.5-source.tar.bz2
 firefox-langpacks-3.5.5-20091105.tar.bz2
+firefox-langpacks-3.6.1-20091118.tar.bz2
+firefox-3.6b2.source.tar.bz2
diff --git a/firefox.spec b/firefox.spec
index 05321ca..b3f58c5 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -2,35 +2,31 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
-%define mozappdir            %{_libdir}/%{name}-%{internal_version}
-%define tarballdir mozilla-1.9.1
+%define mozappdir  	  %{_libdir}/%{name}-%{internal_version}
+%define tarballdir 	  mozilla-1.9.2
 
-%define xulrunner_version 1.9.1.5-1
-%define internal_version %{version}
+%define xulrunner_version 1.9.2.1
+%define internal_version  3.6
 
-%define official_branding    1
-%define build_langpacks      1
+%define official_branding 0
+%define build_langpacks   1
 
 %if ! %{official_branding}
 %define cvsdate 20080327
 %define nightly .cvs%{cvsdate}
+%define prever  b2
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.5
-Release:        1%{?dist}
+Version:        3.6.1
+Release:        0.1.%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-%if %{official_branding}
-%define tarball firefox-%{internal_version}-source.tar.bz2
-%else
-%define tarball firefox-3.1b4-source.tar.bz2
-%endif
-Source0:        %{tarball}
+Source0:        firefox-%{internal_version}%{?prever}.source.tar.bz2
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20091105.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091118.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -41,6 +37,8 @@ Source23:       firefox.1
 Source100:      find-external-requires
 
 
+#Build patches
+Patch0:         firefox-version.patch
 
 # Upstream patches
 
@@ -59,7 +57,7 @@ Source100:      find-external-requires
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  desktop-file-utils
 BuildRequires:  system-bookmarks
-BuildRequires:  xulrunner-devel-unstable >= %{xulrunner_version}
+BuildRequires:  xulrunner-devel >= %{xulrunner_version}
 
 Requires:       xulrunner >= %{xulrunner_version}
 Requires:       system-bookmarks
@@ -80,6 +78,11 @@ compliance, performance and portability.
 %setup -q -c
 cd %{tarballdir}
 
+sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
+    > version.patch
+%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+    
+
 # For branding specific patches.
 
 %if %{official_branding}
@@ -133,6 +136,11 @@ make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 %{__rm} -rf $RPM_BUILD_ROOT
 cd %{tarballdir}
 
+INTERNAL_GECKO=%{internal_version}
+
+INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
+MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
+
 DESTDIR=$RPM_BUILD_ROOT make install
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
@@ -330,6 +338,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Nov 13 2009 Martin Stransky <stransky@redhat.com> - 3.6.1-0.1.b2
+- Rebase to 3.6.1 Beta 2
+
 * Thu Nov  5 2009 Jan Horak <jhorak@redhat.com> - 3.5.5-1
 - Update to 3.5.5
 
diff --git a/sources b/sources
index b1faa3f..f679e2a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b3d92dfb40584141dc1068efc9bdfccc  firefox-3.5.5-source.tar.bz2
-d3e23da5bac91f377db7f9b46866a665  firefox-langpacks-3.5.5-20091105.tar.bz2
+29da539ba954deea6c678d4d5e0fb85a  firefox-langpacks-3.6.1-20091118.tar.bz2
+639cb790cecae3bde47ec650ab03c9a1  firefox-3.6b2.source.tar.bz2