Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22013 Modified Files: .cvsignore sources thunderbird-enigmail.spec thunderbird-mozconfig thunderbird-shared-error.patch Added Files: thunderbird-version.patch xulrunner-1.9.2.1-build.patch Removed Files: thunderbird-3.0-ppc64.patch thunderbird-clipboard-crash.patch Log Message: update to enigmail 1.1.1 for thunderbird 3.1 thunderbird-version.patch: Makefile.in | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE thunderbird-version.patch --- 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 $(topsrcdir)/config/rules.mk +MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__" + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in xulrunner-1.9.2.1-build.patch: nsFrame.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xulrunner-1.9.2.1-build.patch --- diff -up xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h --- xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h.old 2009-11-11 15:34:51.000000000 +0100 +++ xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h 2009-11-11 15:33:09.000000000 +0100 @@ -157,7 +157,7 @@ private: // Left undefined; nsFrame objects are never allocated from the heap. void* operator new(size_t sz) CPP_THROW_NEW; -protected: +public: // Overridden to prevent the global delete from being called, since // the memory came out of an arena instead of the heap. // Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Feb 2010 16:13:54 -0000 1.6 +++ .cvsignore 26 Jun 2010 08:09:53 -0000 1.7 @@ -1,2 +1,2 @@ -thunderbird-3.0.1.source.tar.bz2 -enigmail-1.0.1.tar.gz +thunderbird-3.1.source.tar.bz2 +enigmail-1.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Feb 2010 16:13:54 -0000 1.6 +++ sources 26 Jun 2010 08:09:53 -0000 1.7 @@ -1,2 +1,2 @@ -f004aa5ddf2a30b5df96e06df416b0c9 thunderbird-3.0.1.source.tar.bz2 -508ca9ab0396afb49e82eda88014924b enigmail-1.0.1.tar.gz +feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2 +3f67c2caf316a668894833d18e41919a enigmail-1.1.1.tar.gz Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- thunderbird-enigmail.spec 1 Feb 2010 16:13:54 -0000 1.5 +++ thunderbird-enigmail.spec 26 Jun 2010 08:09:53 -0000 1.6 @@ -2,12 +2,10 @@ %global nss_version 3.12.3.99 %global cairo_version 1.8.8 %global freetype_version 2.1.9 -%global sqlite_version 3.6.14 -%global build_langpacks 1 +%global sqlite_version 3.6.22 %global moz_objdir objdir-tb -%global thunver 3.0.1 -#global CVS 20091121 +%global thunver 3.1 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -15,25 +13,26 @@ # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' #%define tarballdir . -%global tarballdir comm-1.9.1 +%global tarballdir comm-1.9.2 %global official_branding 1 -%global version_internal 3.0 +%global version_internal 3.1 %global mozappdir %{_libdir}/%{name}-%{version_internal} + Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 1.0.1 -%if 0%{?CVS} -Release: 0.1.cvs%{CVS}%{?dist} +Version: 1.1.1 +%if 0%{?prever:1} +Release: 0.1.%{prever}%{?dist} %else Release: 1%{?dist} %endif 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: thunderbird-%{thunver}%{?thunbeta}.source.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded @@ -46,7 +45,7 @@ # tar czf /home/rpmbuild/SOURCES/enigmail-20091121.tgz --exclude CVS -C enigmail/src . Source100: enigmail-%{CVS}.tgz %else -Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{version}.tar.gz +Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{version}%{?pre... %endif # http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html @@ -55,22 +54,21 @@ # From sunbird.src.rpm Source102: mozilla-extension-update.sh -# Build patches +# Fix for version issues +Patch0: thunderbird-version.patch +# Fix for jemalloc Patch1: mozilla-jemalloc.patch +# Fix for installation fail when building with dynamic linked libraries Patch2: thunderbird-shared-error.patch -Patch4: thunderbird-clipboard-crash.patch - -Patch9: thunderbird-3.0-ppc64.patch - +# Fixes gcc complain that nsFrame::delete is protected +Patch4: xulrunner-1.9.2.1-build.patch %if %{official_branding} # Required by Mozilla Corporation - %else # Not yet approved by Mozillla Corporation - %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -137,20 +135,20 @@ %setup -q -c cd %{tarballdir} +sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ + > version.patch +%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch + %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error -%patch4 -p1 -b .clipboard-crash - -%patch9 -p0 -b .ppc64 +%patch4 -p1 -b .protected %if %{official_branding} # Required by Mozilla Corporation - %else # Not yet approved by Mozillla Corporation - %endif @@ -183,6 +181,9 @@ %build cd %{tarballdir} +INTERNAL_GECKO=%{version_internal} +MOZ_APP_DIR=%{mozappdir} + # 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_ MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//') @@ -280,6 +281,9 @@ #=============================================================================== %changelog +* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.1.1-1 +- Enigmail 1.1.1 (against thunderbird 3.1) + * Mon Feb 01 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.0.1-1 - Enigmail 1.0.1 (against thunderbird 3.0.1) Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thunderbird-mozconfig 1 Feb 2010 16:13:54 -0000 1.3 +++ thunderbird-mozconfig 26 Jun 2010 08:09:53 -0000 1.4 @@ -27,6 +27,7 @@ ac_add_options --enable-canvas ac_add_options --enable-system-hunspell ac_add_options --disable-crashreporter +ac_add_options --disable-necko-wifi 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/free/rpms/thunderbird-enigmail/devel/thunderbird-shared-error.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thunderbird-shared-error.patch 21 Nov 2009 12:38:17 -0000 1.3 +++ thunderbird-shared-error.patch 26 Jun 2010 08:09:53 -0000 1.4 @@ -11,5 +11,6 @@ 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-3.0-ppc64.patch DELETED --- --- thunderbird-clipboard-crash.patch DELETED ---