Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3162 Modified Files: .cvsignore sources thunderbird-enigmail.spec Added Files: enigmail-1.1.2-perm.patch remove-static.patch xulrunner-missing-headers.patch Removed Files: mozilla-extension-update.sh Log Message: update to 1.1.2 and move to /usr/lib/mozilla/extensions 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 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: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 26 Jun 2010 08:09:53 -0000 1.7 +++ .cvsignore 22 Jul 2010 07:08:48 -0000 1.8 @@ -1,2 +1,2 @@ -thunderbird-3.1.source.tar.bz2 -enigmail-1.1.1.tar.gz +thunderbird-3.1.1.source.tar.bz2 +enigmail-1.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Jun 2010 17:54:40 -0000 1.8 +++ sources 22 Jul 2010 07:08:48 -0000 1.9 @@ -1,2 +1,2 @@ -feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2 -a0f424cf2eb3a29a6cbb70669a0765bc enigmail-1.1.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/devel/thunderbird-enigmail.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thunderbird-enigmail.spec 26 Jun 2010 17:54:40 -0000 1.8 +++ thunderbird-enigmail.spec 22 Jul 2010 07:08:48 -0000 1.9 @@ -6,7 +6,7 @@ %global libnotify_version 0.4 %global moz_objdir objdir-tb -%global thunver 3.1 +%global thunver 3.1.1 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -19,16 +19,17 @@ %global official_branding 1 %global version_internal 3.1 -%global mozappdir %{_libdir}/%{name}-%{version_internal} +%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.1.1 +Version: 1.1.2 %if 0%{?prever:1} Release: 0.1.%{prever}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif URL: http://enigmail.mozdev.org/ License: MPLv1.1 or GPLv2+ @@ -52,9 +53,6 @@ # http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html Source101: enigmail-fixlang.php -# From sunbird.src.rpm -Source102: mozilla-extension-update.sh - # Fix for version issues Patch0: thunderbird-version.patch # Fix for jemalloc @@ -63,6 +61,12 @@ Patch2: thunderbird-shared-error.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 @@ -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 @@ -144,6 +139,8 @@ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error %patch4 -p1 -b .protected +%patch5 -p0 -b .stat +%patch6 -p1 -b .static %if %{official_branding} # Required by Mozilla Corporation @@ -176,6 +173,9 @@ popd %else tar xzf %{SOURCE100} -C mailnews/extensions +pushd mailnews/extensions/enigmail +%patch101 -p1 +popd %endif #=============================================================================== @@ -233,56 +233,29 @@ cd %{tarballdir} %{__rm} -rf $RPM_BUILD_ROOT -%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir} +%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname} -%{__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 -%{__chmod} +x $RPM_BUILD_ROOT%{_libdir}/%{name}/wrappers/*.sh +%{__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) --- mozilla-extension-update.sh DELETED ---