rpms/thunderbird/devel .cvsignore, 1.9, 1.10 sources, 1.12, 1.13 thunderbird-redhat-default-prefs.js, 1.1, 1.2 thunderbird.spec, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9767

Modified Files:
	.cvsignore sources thunderbird-redhat-default-prefs.js 
	thunderbird.spec 
Log Message:
* Fri Jan 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5-2
- Add some langpacks back in
- Stop providing MozillaThunderbird



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Jan 2006 08:57:15 -0000	1.9
+++ .cvsignore	28 Jan 2006 06:15:15 -0000	1.10
@@ -7,3 +7,4 @@
 thunderbird-1.5b2-source.tar.bz2
 thunderbird-1.5rc1-source.tar.bz2
 thunderbird-1.5-source.tar.bz2
+thunderbird-langpacks-20060127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jan 2006 08:57:15 -0000	1.12
+++ sources	28 Jan 2006 06:15:16 -0000	1.13
@@ -1 +1,2 @@
 781c1cd1a01583d9b666d8c2fe4288e6  thunderbird-1.5-source.tar.bz2
+df32df3b18b0f9af5687d8a0cab08782  thunderbird-langpacks-20060127.tar.bz2


Index: thunderbird-redhat-default-prefs.js
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird-redhat-default-prefs.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-redhat-default-prefs.js	16 Dec 2004 22:21:15 -0000	1.1
+++ thunderbird-redhat-default-prefs.js	28 Jan 2006 06:15:16 -0000	1.2
@@ -1,8 +1,10 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
 
 # Make hyperlinks work
 pref("network.protocol-handler.app.http", "COMMAND");
 pref("network.protocol-handler.app.https", "COMMAND");
 pref("network.protocol-handler.app.ftp", "COMMAND");
-


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- thunderbird.spec	12 Jan 2006 08:57:15 -0000	1.60
+++ thunderbird.spec	28 Jan 2006 06:15:16 -0000	1.61
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5
-Release:	1
+Release:	2
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -19,6 +19,7 @@
 %define tarball thunderbird-1.5rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
+Source1:        thunderbird-langpacks-20060127.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -65,7 +66,6 @@
 BuildRequires:	freetype-devel
 Prereq:		desktop-file-utils >= %{desktop_file_utils_version}
 Obsoletes:	MozillaThunderbird
-Provides:	MozillaThunderbird = %{epoch}:%{version}
 
 %define tbdir %{_libdir}/thunderbird-%{version}
 
@@ -161,6 +161,18 @@
 # own mozilla plugin dir (#135050)
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
+# Install langpacks
+%{__mkdir_p} $RPM_BUILD_ROOT%{tbdir}/extensions
+%{__tar} xjf %{SOURCE1}
+for langpack in `ls thunderbird-langpacks/*.xpi`; do
+  language=`basename $langpack .xpi`
+  extensiondir=$RPM_BUILD_ROOT%{tbdir}/extensions/langpack-$language at thunderbird.mozilla.org
+  %{__mkdir_p} $extensiondir
+  unzip $langpack -d $extensiondir
+done
+%{__rm} -rf thunderbird-langpacks
+
+
 %{__rm} -f $RPM_BUILD_ROOT%{tbdir}/thunderbird-config
 
 cd $RPM_BUILD_ROOT%{tbdir}/chrome
@@ -187,6 +199,10 @@
 #===============================================================================
 
 %changelog
+* Fri Jan 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5-2
+- Add some langpacks back in
+- Stop providing MozillaThunderbird
+
 * Thu Jan 12 2006 Christopher Aillon <caillon at redhat.com> - 1.5-1
 - Official 1.5 release is out