rpms/firefox/devel .cvsignore, 1.109, 1.110 firefox.spec, 1.357, 1.358 sources, 1.122, 1.123

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2636

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- .cvsignore	18 Jan 2010 12:07:08 -0000	1.109
+++ .cvsignore	22 Jan 2010 10:19:19 -0000	1.110
@@ -22,3 +22,5 @@ firefox-3.6rc1.source.tar.bz2
 firefox-langpacks-3.6.1-20100113.tar.bz2
 firefox-3.6rc2.source.tar.bz2
 firefox-langpacks-3.6.1-20100118.tar.bz2
+firefox-3.6.source.tar.bz2
+firefox-langpacks-3.6.1-20100122.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -p -r1.357 -r1.358
--- firefox.spec	18 Jan 2010 12:57:48 -0000	1.357
+++ firefox.spec	22 Jan 2010 10:19:19 -0000	1.358
@@ -5,11 +5,11 @@
 %define mozappdir               %{_libdir}/%{name}-%{internal_version}
 %define tarballdir              mozilla-1.9.2
 
-%define xulrunner_version       1.9.2.1-0.10.rc2
+%define xulrunner_version       1.9.2.1-1
 %define xulrunner_version_max   1.9.3
 %define internal_version        3.6
 
-%define official_branding       0
+%define official_branding       1
 %define build_langpacks         1
 
 %if ! %{official_branding}
@@ -21,14 +21,14 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.6.1
-Release:        0.11.%{?prever}%{?dist}
+Release:        1%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 # From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
 Source0:        firefox-%{internal_version}%{?prever}.source.tar.bz2
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20100118.tar.bz2
+Source2:        firefox-langpacks-%{version}-20100122.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -348,6 +348,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan 18 2010 Martin Stransky <stransky at redhat.com> - 3.6.1-1
+- Update to 3.6
+
 * Wed Jan 18 2010 Martin Stransky <stransky at redhat.com> - 3.6.1-0.11.rc2
 - Update to 3.6.1 RC2
 - Fix for #556428 - Restricted maximal xulrunner version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	18 Jan 2010 12:07:09 -0000	1.122
+++ sources	22 Jan 2010 10:19:19 -0000	1.123
@@ -1,2 +1,2 @@
-6d850ce9c8a360d8a51205cc7b485150  firefox-3.6rc2.source.tar.bz2
-87806dfc461dba17e68f59fe9983b726  firefox-langpacks-3.6.1-20100118.tar.bz2
+458051557ff49e6a352c1d56eee5782a  firefox-3.6.source.tar.bz2
+d638577ddfc0d5656caf58d9997bae96  firefox-langpacks-3.6.1-20100122.tar.bz2