rpms/thunderbird/devel .cvsignore, 1.25, 1.26 sources, 1.32, 1.33 thunderbird-shared-error.patch, 1.2, 1.3 thunderbird.spec, 1.147, 1.148
Christopher Aillon
caillon at fedoraproject.org
Thu Sep 17 21:13:05 UTC 2009
Author: caillon
Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13458
Modified Files:
.cvsignore sources thunderbird-shared-error.patch
thunderbird.spec
Log Message:
* Thu Sep 17 2009 Christopher Aillon <caillon at redhat.com> - 3.0-3.9.b4
- Beta 4 candidate build 4
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore 21 Jul 2009 11:43:08 -0000 1.25
+++ .cvsignore 17 Sep 2009 21:13:04 -0000 1.26
@@ -1,3 +1,2 @@
-thunderbird-3.0-6a6386c16e98-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.0-20090917.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources 21 Jul 2009 11:43:08 -0000 1.32
+++ sources 17 Sep 2009 21:13:05 -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
+8ed1dc55c3c7cac5731810013fb3e9b8 thunderbird-langpacks-3.0-20090917.tar.bz2
thunderbird-shared-error.patch:
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/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 11:43:08 -0000 1.2
+++ thunderbird-shared-error.patch 17 Sep 2009 21:13:05 -0000 1.3
@@ -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/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- thunderbird.spec 6 Aug 2009 13:20:09 -0000 1.147
+++ thunderbird.spec 17 Sep 2009 21:13:05 -0000 1.148
@@ -4,26 +4,35 @@
%define freetype_version 2.1.9
%define sqlite_version 3.6.14
-%define version_internal 3.0b3
+%define version_internal 3.0b4
%define build_langpacks 1
+# The tarball is pretty inconsistent with directory structure.
+# Sometimes there is a top level directory. That goes here.
+#
+# IMPORTANT: If there is no top level directory, this should be
+# set to the cwd, ie: '.'
+#%define tarballdir .
+%define tarballdir comm-central
+
+%define mozappdir %{_libdir}/thunderbird-%{version_internal}
%define official_branding 1
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 3.0
-Release: 3.8.b3%{?dist}
+Release: 3.9.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}-20090917.tar.bz2
%endif
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
@@ -79,8 +88,6 @@ Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version}
Requires: sqlite >= %{sqlite_version}
-%define mozappdir %{_libdir}/thunderbird-%{version_internal}
-
AutoProv: 0
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE100}
@@ -92,7 +99,7 @@ Mozilla Thunderbird is a standalone mail
%prep
%setup -q -c
-#cd mozilla
+cd %{tarballdir}
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
@@ -117,7 +124,7 @@ Mozilla Thunderbird is a standalone mail
#===============================================================================
%build
-#cd mozilla
+cd %{tarballdir}
# 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_
@@ -142,7 +149,7 @@ make -f client.mk build
%install
%{__rm} -rf $RPM_BUILD_ROOT
-#cd mozilla
+cd %{tarballdir}
cd objdir-tb
DESTDIR=$RPM_BUILD_ROOT make install
@@ -297,6 +304,9 @@ fi
#===============================================================================
%changelog
+* Thu Sep 17 2009 Christopher Aillon <caillon at redhat.com> - 3.0-3.9.b4
+- Beta 4 candidate build 4
+
* Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.0-3.8.beta3
- Added fix for #437596
- Removed unused patches
More information about the fedora-extras-commits
mailing list