6:28 p.m.
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5097
Modified Files:
sources thunderbird-enigmail.spec thunderbird-mozconfig
thunderbird-shared-error.patch
Log Message:
update for thunderbird 3.0RC1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 21 Jul 2009 19:26:21 -0000 1.3
+++ sources 25 Nov 2009 18:28:04 -0000 1.4
@@ -1,2 +1,2 @@
-b127a34e4a1c01c9a876405a2b5abe0e enigmail-20090721.tgz
-84a004d76e82325dd2cc5ff271fd3952 thunderbird-3.0b3-source.tar.bz2
+f9da82698c8171a4cf68bdd234065844 thunderbird-3.0rc1.source.tar.bz2
+4eb9598d9a0e7a8266528ac010eb83d0 enigmail-20091121.tgz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-11/thunderbird-enigmail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thunderbird-enigmail.spec 21 Jul 2009 19:26:21 -0000 1.2
+++ thunderbird-enigmail.spec 25 Nov 2009 18:28:04 -0000 1.3
@@ -1,18 +1,29 @@
-%global nspr_version 4.6
-%global nss_version 3.10
-%global cairo_version 1.0
-%global dbus_glib_version 0.6
+%define nspr_version 4.8
+%define nss_version 3.12.3.99
+%define cairo_version 1.6.0
+%define freetype_version 2.1.9
+%define sqlite_version 3.6.14
+%define version_internal 3.0rc1
+%define build_langpacks 1
+%define moz_objdir objdir-tb
+
+%global thunver 3.0
+%global CVS 20091121
+
+# 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-1.9.1
-%global official_branding 1
-
-%global thunver 3.0
-%global thunbeta b3
-
-%global CVS 20090721
+%define mozappdir %{_libdir}/thunderbird-%{thunver}
+%define official_branding 1
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 0.97a
+Version: 1.0
%if 0%{?CVS}
Release: 0.1.cvs%{CVS}%{?dist}
%else
@@ -21,7 +32,7 @@
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
Group: Applications/Internet
-Source0:
http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunve...
+Source0:
http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{versio...
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
@@ -31,7 +42,7 @@
# cvs -d :pserver:guest@mozdev.org:/cvs login
# => password is guest
# cvs -d :pserver:guest@mozdev.org:/cvs co enigmail/src
-# tar czf /home/rpmbuild/SOURCES/enigmail-20090721.tgz --exclude CVS -C enigmail/src .
+# tar czf /home/rpmbuild/SOURCES/enigmail-20091121.tgz --exclude CVS -C enigmail/src .
Source100: enigmail-%{CVS}.tgz
%else
Source100: http://www.mozilla-enigmail.org/downloads/src/enigmail-%{version}.tar.gz
@@ -60,28 +71,32 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libcurl-devel
-BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel
-BuildRequires: zlib-devel, gzip, zip, unzip
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version}
+BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-devel
+BuildRequires: zip
+BuildRequires: bzip2-devel
+BuildRequires: zlib-devel, gzip, zip, unzip
BuildRequires: libIDL-devel
-BuildRequires: desktop-file-utils
-BuildRequires: pango-devel >= 1.22
-BuildRequires: freetype-devel >= 2.1.9
+BuildRequires: gtk2-devel
+BuildRequires: gnome-vfs2-devel
+BuildRequires: libgnome-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: krb5-devel
+BuildRequires: pango-devel
+BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: libXt-devel
BuildRequires: libXrender-devel
+BuildRequires: hunspell-devel
+BuildRequires: sqlite-devel >= %{sqlite_version}
+BuildRequires: startup-notification-devel
BuildRequires: alsa-lib-devel
BuildRequires: autoconf213
+BuildRequires: desktop-file-utils
BuildRequires: GConf2-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: libgnomeui-devel
-
-%define mozappdir %{_libdir}/thunderbird-%{thunver}%{?thunbeta}
## For fixing lang
%if 0%{?CVS}
@@ -117,7 +132,7 @@
%prep
%setup -q -c
-#cd mozilla
+cd %{tarballdir}
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
@@ -161,7 +176,7 @@
#===============================================================================
%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_
@@ -172,18 +187,18 @@
export LIBDIR='%{_libdir}'
%define moz_make_flags -j1
-#%ifarch ppc ppc64 s390 s390x
-#%define moz_make_flags -j1
-#%else
-#%define moz_make_flags %{?_smp_mflags}
-#%endif
+%ifarch ppc ppc64 s390 s390x
+%define moz_make_flags -j1
+%else
+%define moz_make_flags %{?_smp_mflags}
+%endif
export LDFLAGS="-Wl,-rpath,%{mozappdir}"
export MAKE="gmake %{moz_make_flags}"
# ===== Minimal build =====
make -f client.mk export
-pushd objdir-tb/mozilla/modules/libreg
+pushd %{moz_objdir}/mozilla/modules/libreg
make
cd ../../xpcom/string
make
@@ -198,7 +213,7 @@
./makemake -r
popd
-pushd objdir-tb/mailnews/extensions/enigmail
+pushd %{moz_objdir}/mailnews/extensions/enigmail
make
make xpi
popd
@@ -207,11 +222,12 @@
#===============================================================================
%install
+cd %{tarballdir}
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}
-%{__unzip} -q objdir-tb/mozilla/dist/bin/enigmail-%{version}-linux-*.xpi -d
$RPM_BUILD_ROOT%{_libdir}/%{name}
+%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-%{version}-linux-*.xpi -d
$RPM_BUILD_ROOT%{_libdir}/%{name}
%{__install} -p -m 755 %{SOURCE102}
$RPM_BUILD_ROOT%{_libdir}/%{name}/mozilla-extension-update.sh
@@ -259,6 +275,9 @@
#===============================================================================
%changelog
+* Sat Nov 21 2009 Remi Collet <rpms(a)famillecollet.com> 1.0-0.1.cvs20091121
+- new CVS snapshot (against thunderbird 3.0rc1)
+
* Tue Jul 21 2009 Remi Collet <rpms(a)famillecollet.com> 0.97a-0.1.cvs20090721
- new CVS snapshot (against thunderbird 3.0b3)
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-11/thunderbird-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-mozconfig 22 May 2009 18:42:43 -0000 1.1
+++ thunderbird-mozconfig 25 Nov 2009 18:28:04 -0000 1.2
@@ -26,6 +26,7 @@
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --disable-crashreporter
+ac_add_options --enable-system-hunspell
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
thunderbird-shared-error.patch:
Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-11/thunderbird-shared-error.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thunderbird-shared-error.patch 21 Jul 2009 19:26:21 -0000 1.2
+++ thunderbird-shared-error.patch 25 Nov 2009 18:28:04 -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 @@
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