Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv8310 Modified Files: sources thunderbird-enigmail.spec thunderbird-mozconfig thunderbird-shared-error.patch Added Files: enigmail-1.1.2-perm.patch remove-static.patch thunderbird-version.patch xulrunner-1.9.2.1-build.patch xulrunner-missing-headers.patch Removed Files: mozilla-extension-update.sh thunderbird-3.0-ppc64.patch thunderbird-clipboard-crash.patch Log Message: update to enigmail 1.1.2 for thunderbird 3.1.1 enigmail-1.1.2-perm.patch: enigmail.js | 2 -- 1 file changed, 2 deletions(-) --- NEW FILE enigmail-1.1.2-perm.patch --- diff -up enigmail-1.1.2/package/enigmail.js.perm enigmail-1.1.2/package/enigmail.js --- enigmail-1.1.2/package/enigmail.js.perm 2010-06-30 19:18:50.000000000 +0200 +++ enigmail-1.1.2/package/enigmail.js 2010-06-30 19:19:22.000000000 +0200 @@ -1231,7 +1231,6 @@ function () { .getInstallLocation(ENIGMAIL_EXTENSION_ID); var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers"); extensionLoc.append("gpg-agent-wrapper.sh"); - extensionLoc.permissions=0755; agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess); agentProcess.init(extensionLoc); agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2); @@ -1758,7 +1757,6 @@ function (domWindow) { .getInstallLocation(ENIGMAIL_EXTENSION_ID); var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers"); extensionLoc.append("gpg-agent-wrapper.sh"); - extensionLoc.permissions=0755; args.unshift(command.path); args.unshift("start"); command = extensionLoc; remove-static.patch: Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE remove-static.patch --- diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in --- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200 +++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200 @@ -64,6 +64,6 @@ FORCE_USE_PIC = 1 #XXX: bug 554854 causes us to be unable to run binaries on the build slaves # due to them having an older libstdc++ -HOST_LDFLAGS += -static +#HOST_LDFLAGS += -static include $(topsrcdir)/config/rules.mk 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. // xulrunner-missing-headers.patch: file_id.cc | 1 + 1 file changed, 1 insertion(+) --- NEW FILE xulrunner-missing-headers.patch --- diff -up mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc --- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat 2010-06-16 15:12:57.000000000 +0200 +++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc 2010-06-16 15:13:02.000000000 +0200 @@ -42,6 +42,7 @@ #include <link.h> #include <string.h> #include <sys/mman.h> +#include <sys/stat.h> #include <unistd.h> #include <algorithm> Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-13/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 22 Jul 2010 08:21:17 -0000 1.7 @@ -1,2 +1,2 @@ -f004aa5ddf2a30b5df96e06df416b0c9 thunderbird-3.0.1.source.tar.bz2 -508ca9ab0396afb49e82eda88014924b enigmail-1.0.1.tar.gz +3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2 +7d329d5e8afbbb28214ca1995beb09c9 enigmail-1.1.2.tar.gz Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-13/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 22 Jul 2010 08:21:17 -0000 1.6 @@ -2,12 +2,11 @@ %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 libnotify_version 0.4 %global moz_objdir objdir-tb -%global thunver 3.0.1 -#global CVS 20091121 +%global thunver 3.1.1 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -15,25 +14,27 @@ # 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 mozappdir %{_libdir}/%{name}-%{version_internal} +%global version_internal 3.1 +%global mozappdir %{_libdir}/thunderbird-%{version_internal} +%global enigmail_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{847b3a00-7ab1-11d4-8f02-006008948af5} + 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.2 +%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,37 +47,40 @@ # 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 Source101: enigmail-fixlang.php -# 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 +# Fix missing includes for crash reporter, remove in 3.1 final +Patch5: xulrunner-missing-headers.patch +Patch6: remove-static.patch +# Enigmail patch +Patch101: enigmail-1.1.2-perm.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) BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} BuildRequires: cairo-devel >= %{cairo_version} +BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: zip @@ -111,20 +115,11 @@ # because provided by xulrunner). AutoReq: 0 # All others deps already required by thunderbird -Requires: gnupg, thunderbird >= %{thunver} +Requires: gnupg, thunderbird >= %{version_internal} # Nothing usefull provided AutoProv: 0 -%global enigmail_extname '{847b3a00-7ab1-11d4-8f02-006008948af5}' -%global tbupdate \\\ - %{_libdir}/%{name}/mozilla-extension-update.sh \\\ - --appname thunderbird \\\ - --extname %{enigmail_extname} \\\ - --basedir %{_libdir} \\\ - --extpath %{_libdir}/%{name} \\\ - --action - %description Enigmail is an extension to the mail client Mozilla Thunderbird @@ -137,20 +132,22 @@ %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 +%patch5 -p0 -b .stat +%patch6 -p1 -b .static %if %{official_branding} # Required by Mozilla Corporation - %else # Not yet approved by Mozillla Corporation - %endif @@ -176,6 +173,9 @@ popd %else tar xzf %{SOURCE100} -C mailnews/extensions +pushd mailnews/extensions/enigmail +%patch101 -p1 +popd %endif #=============================================================================== @@ -183,6 +183,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//') @@ -230,56 +233,38 @@ cd %{tarballdir} %{__rm} -rf $RPM_BUILD_ROOT -%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir} - -%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{_libdir}/%{name} -%{__install} -p -m 755 %{SOURCE102} $RPM_BUILD_ROOT%{_libdir}/%{name}/mozilla-extension-update.sh +%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname} +%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname} +%{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh %clean %{__rm} -rf $RPM_BUILD_ROOT -%post -%{tbupdate} install || : - - -%preun -if [ $1 = 0 ]; then - %{tbupdate} remove || : -fi - -%postun -# This is needed not to reverse the effect of our preun, which -# is guarded against upgrade, but because of our triggerun, -# which is run on self-upgrade, though triggerpostun isn't -if [ $1 != 0 ]; then - %{tbupdate} install || : -fi - -%triggerin -- thunderbird -%{tbupdate} install || : - -%triggerun -- thunderbird -%{tbupdate} remove || : - -%triggerpostun -- thunderbird -# Guard against being run post-self-uninstall, even though that -# doesn't happen currently (see comment above) -if [ $1 != 0 ]; then - %{tbupdate} install || : -fi - - %files %defattr(-,root,root,-) -%{_libdir}/%{name} +%{enigmail_extname} #=============================================================================== %changelog +* Thu Jul 22 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.1.2-1 +- Enigmail 1.1.2 (against thunderbird 3.1.1) +- move to /usr/lib/mozilla/extensions (as lightning) +- sync patches with F-13 + +* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.1.1-2 +- new sources (only fix displayed version) + +* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.1.1-1.1 +- missing BR libnotify-devel + +* 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/F-13/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 22 Jul 2010 08:21:17 -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/F-13/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 22 Jul 2010 08:21:17 -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 + + --- mozilla-extension-update.sh DELETED --- --- thunderbird-3.0-ppc64.patch DELETED --- --- thunderbird-clipboard-crash.patch DELETED ---