rpms/thunderbird/devel .cvsignore, 1.35, 1.36 sources, 1.42, 1.43 thunderbird-shared-error.patch, 1.4, 1.5 thunderbird-version.patch, 1.1, 1.2 thunderbird.spec, 1.166, 1.167

Thu May 27 21:19:28 UTC 2010

Author: caillon

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21623

Modified Files:
	.cvsignore sources thunderbird-shared-error.patch 
	thunderbird-version.patch thunderbird.spec 
Log Message:
* Tue May 25 2010 Christopher Aillon <caillon at redhat.com> 3.1-0.1.rc1
- Thunderbird 3.1 RC1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36

--- .cvsignore	30 Mar 2010 07:43:19 -0000	1.35
+++ .cvsignore	27 May 2010 21:19:28 -0000	1.36
@@ -1,2 +1,2 @@
-thunderbird-3.0.4.source.tar.bz2
-thunderbird-langpacks-3.0.4-20100330.tar.bz2
+thunderbird-3.1rc1.source.tar.bz2
+thunderbird-langpacks-3.1-20100527.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	30 Mar 2010 07:43:20 -0000	1.42
+++ sources	27 May 2010 21:19:28 -0000	1.43
@@ -1,2 +1,2 @@
-bb87ca7e62d5869422137765126798be  thunderbird-3.0.4.source.tar.bz2
-5b51715204ff7f0c33dac25e0ba27b16  thunderbird-langpacks-3.0.4-20100330.tar.bz2
+b47a9a014f10a383741bf2806990a796  thunderbird-3.1rc1.source.tar.bz2
+31ee40e57d44bc0ce5674d0b57c3e7d1  thunderbird-langpacks-3.1-20100527.tar.bz2

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

Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-shared-error.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- thunderbird-shared-error.patch	22 Sep 2009 09:12:07 -0000	1.4
+++ thunderbird-shared-error.patch	27 May 2010 21:19:28 -0000	1.5
@@ -11,5 +11,6 @@ diff -up comm-central/mail/installer/Mak
  endif
 +endif
  
- # 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
+ include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
+ 
+

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

Index: thunderbird-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunderbird-version.patch	20 Jan 2010 14:15:07 -0000	1.1
+++ thunderbird-version.patch	27 May 2010 21:19:28 -0000	1.2
@@ -1,11 +1,12 @@
---- comm-1.9.1/mail/installer/Makefile.in.old	2010-01-20 14:27:43.000000000 +0100
-+++ comm-1.9.1/mail/installer/Makefile.in	2010-01-20 14:29:21.000000000 +0100
-@@ -42,6 +42,8 @@ VPATH		= @srcdir@
+diff -up comm-1.9.2/mail/installer/Makefile.in.version comm-1.9.2/mail/installer/Makefile.in
+--- comm-1.9.2/mail/installer/Makefile.in.version	2010-05-21 11:42:45.000000000 -0700
++++ comm-1.9.2/mail/installer/Makefile.in	2010-05-25 15:16:18.446197181 -0700
+@@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
  
- include $(DEPTH)/config/autoconf.mk
+ include $(topsrcdir)/config/rules.mk
  
 +MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
 +
- NO_PKG_FILES = \
- 	thunderbird-bin.elf \
- 	thunderbird-config \
+ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
+ 
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- thunderbird.spec	30 Apr 2010 09:12:46 -0000	1.166
+++ thunderbird.spec	27 May 2010 21:19:28 -0000	1.167
@@ -13,30 +13,31 @@
 # IMPORTANT: If there is no top level directory, this should be 
 # set to the cwd, ie: '.'
 #%define tarballdir .
-%define tarballdir comm-1.9.1
+%define tarballdir comm-1.9.2
 
 %define official_branding 1
 %define include_debuginfo 0
 
-%define version_internal  3.0
+%define version_internal  3.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        3.0.4
-Release:        3%{?dist}
+Version:        3.1
+Release:        0.1.rc1%{?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}.source.tar.bz2
+#%define tarball thunderbird-%{version}.source.tar.bz2
+%define tarball thunderbird-3.1rc1.source.tar.bz2
 %else
-%define tarball thunderbird-3.0b2-source.tar.bz2
+%define tarball thunderbird-3.1rc1.source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
 # Language package archive is build by RH
-Source1:        thunderbird-langpacks-%{version}-20100330.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20100527.tar.bz2
 %endif
 # Config file for compilation
 Source10:       thunderbird-mozconfig
@@ -61,8 +62,7 @@ Patch0:         thunderbird-version.patc
 Patch1:         mozilla-jemalloc.patch
 # Fix for installation fail when building with dynamic linked libraries
 Patch2:         thunderbird-shared-error.patch
-# Fix for crash mozbz#550455, remove when 3.0.5
-Patch3:         thunderbird-436533.patch
+
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -109,38 +109,6 @@ AutoProv: 0
 %description
 Mozilla Thunderbird is a standalone mail and newsgroup client.
 
-#%package devel
-#Summary: Development files for Thunderbird
-#Group: Development/Libraries
-#Provides: thunderbird-devel = %{version}
-#
-#Requires: thunderbird = %{version}-%{release}
-#Requires: nspr-devel >= %{nspr_version}
-#Requires: nss-devel >= %{nss_version}
-#Requires: cairo-devel >= %{cairo_version}
-#Requires: libjpeg-devel
-#Requires: bzip2-devel
-#Requires: zlib-devel
-#Requires: libIDL-devel
-#Requires: gtk2-devel
-#Requires: gnome-vfs2-devel
-#Requires: libgnome-devel
-#Requires: libgnomeui-devel
-#Requires: krb5-devel
-#Requires: pango-devel
-#Requires: freetype-devel >= %{freetype_version}
-#Requires: libXt-devel
-#Requires: libXrender-devel
-#Requires: hunspell-devel
-#Requires: sqlite-devel
-#Requires: startup-notification-devel
-#Requires: alsa-lib-devel
-#Requires: libnotify-devel
-
-#%description devel
-#Thunderbird development files.
-#
-#===============================================================================
 
 %prep
 %setup -q -c
@@ -152,7 +120,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
-%patch3 -p1 -b .436533
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -323,15 +290,6 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROO
 touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
-# Devel package - sdk
-#%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/idl/thunderbird-%{version_internal}
-#%{__cp} %{moz_objdir}/mozilla/dist/sdk/idl/* $RPM_BUILD_ROOT%{_datadir}/idl/thunderbird-%{version_internal}
-
-#%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/include/thunderbird-%{version_internal}
-#%{__cp} %{moz_objdir}/mozilla/dist/sdk/include/* $RPM_BUILD_ROOT%{_datadir}/include/thunderbird-%{version_internal}
-
-#%{__cp} %{moz_objdir}/mozilla/dist/sdk/bin/* $RPM_BUILD_ROOT%{mozappdir}/
-
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{include_debuginfo}
@@ -422,18 +380,13 @@ fi
 %{mozappdir}/Throbber-small.gif
 %endif
 
-# TODO: devel package
-#%files devel 
-#%defattr(-,root,root,-) 
-#%{_datadir}/idl/thunderbird-%{version_internal}
-#%{_datadir}/include/thunderbird-%{version_internal}
-#%{mozappdir}/xpidl
-#%{mozappdir}/xpt_dump
-#%{mozappdir}/xpt_link
 
 #===============================================================================
 
 %changelog
+* Tue May 25 2010 Christopher Aillon <caillon at redhat.com> 3.1-0.1.rc1
+- Thunderbird 3.1 RC1
+
 * Fri Apr 30 2010 Jan Horak <jhorak at redhat.com> - 3.0.4-3
 - Fix for mozbz#550455
 

