rpms/thunderbird/F-11 .cvsignore, 1.24, 1.25 sources, 1.32, 1.33 thunderbird-mozconfig, 1.16, 1.17 thunderbird-shared-error.patch, 1.2, 1.3 thunderbird.spec, 1.140, 1.141

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19480

Modified Files:
	.cvsignore sources thunderbird-mozconfig 
	thunderbird-shared-error.patch thunderbird.spec 
Log Message:
Update to 3.0 beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	21 Jul 2009 10:24:05 -0000	1.24
+++ .cvsignore	22 Sep 2009 06:51:35 -0000	1.25
@@ -2,3 +2,5 @@ thunderbird-langpacks-3.0-20090302.tar.b
 thunderbird-3.0b2-source.tar.bz2
 thunderbird-3.0b3-source.tar.bz2
 thunderbird-langpacks-3.0-20090721.tar.bz2
+thunderbird-3.0b4-source.tar.bz2
+thunderbird-langpacks-3.0b4-20090917.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	21 Jul 2009 10:24:05 -0000	1.32
+++ sources	22 Sep 2009 06:51:35 -0000	1.33
@@ -1,2 +1,2 @@
-84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
-f38cc1a9e69bff77e4eba2385272c671  thunderbird-langpacks-3.0-20090721.tar.bz2
+0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2
+296dace664509393536e5548b9a82bee  thunderbird-langpacks-3.0b4-20090917.tar.bz2


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-mozconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- thunderbird-mozconfig	6 Aug 2009 09:46:46 -0000	1.16
+++ thunderbird-mozconfig	22 Sep 2009 06:51:35 -0000	1.17
@@ -26,6 +26,9 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-crashreporter
+ac_add_options --disable-static
+ac_add_options --disable-static-mail
+#ac_add_options --enable-libxul
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

thunderbird-shared-error.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-shared-error.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunderbird-shared-error.patch	21 Jul 2009 10:24:05 -0000	1.2
+++ thunderbird-shared-error.patch	22 Sep 2009 06:51:35 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
---- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-07-13 14:56:36.000000000 +0200
-+++ thunderbird-3.0/mail/installer/Makefile.in	2009-07-14 12:41:16.000000000 +0200
-@@ -94,9 +94,11 @@ endif
+diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
+--- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
++++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
+@@ -95,9 +95,11 @@ endif
  # mozconfig instead.
  ifndef MAIL_PKG_SHARED
  ifndef BUILD_STATIC_LIBS
@@ -11,5 +11,5 @@ diff -up thunderbird-3.0/mail/installer/
  endif
 +endif
  
- include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
- 
+ # On mozilla-central, packager.mk uses core_abspath to redefine DIST
+ # As the comm-central config.mk doesn't set it, do it ourselves instead


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- thunderbird.spec	14 Aug 2009 08:41:10 -0000	1.140
+++ thunderbird.spec	22 Sep 2009 06:51:35 -0000	1.141
@@ -3,7 +3,7 @@
 %define nss_version 3.12.3
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
-%define version_internal 3.0b3
+%define version_internal 3.0b4
 %define build_langpacks 1
 
 %define official_branding 1
@@ -11,18 +11,18 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.6.b3%{?dist}
+Release:        2.7.b4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version}b3-source.tar.bz2 
+%define tarball thunderbird-%{version}b4-source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20090721.tar.bz2
+Source1:        thunderbird-langpacks-%{version}b4-20090917.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -83,7 +83,7 @@ Mozilla Thunderbird is a standalone mail
 
 %prep
 %setup -q -c
-#cd mozilla
+cd comm-central
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
@@ -108,7 +108,7 @@ Mozilla Thunderbird is a standalone mail
 #===============================================================================
 
 %build
-#cd mozilla
+cd comm-central
 
 # Build with -Os as it helps the browser; also, don't override mozilla's warning
 # level; they use -Wall but disable a few warnings that show up _everywhere_
@@ -133,7 +133,7 @@ make -f client.mk build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-#cd mozilla
+cd comm-central
 
 cd objdir-tb
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -239,7 +239,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files -f %{name}.lang
+%files -f comm-central/%{name}.lang
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
@@ -288,6 +288,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Sep 17 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.7
+- Update to 3.0 beta4
+
 * Thu Jul 16 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.6
 - Rebuild for update