Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25725 Modified Files: .cvsignore sources thunderbird-enigmail.spec thunderbird-mozconfig xulrunner-10.0-gcc47.patch Added Files: xulrunner-prtime.patch Removed Files: mozilla-724615.patch mozilla-733867-x.patch mozilla-file.patch Log Message: Enigmail 1.4.2 for Thunderbird 13.0 xulrunner-prtime.patch: PHal.ipdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xulrunner-prtime.patch --- diff -up mozilla-release/hal/sandbox/PHal.ipdl.old mozilla-release/hal/sandbox/PHal.ipdl --- mozilla-release/hal/sandbox/PHal.ipdl.old 2012-06-01 14:04:00.000000000 +0200 +++ mozilla-release/hal/sandbox/PHal.ipdl 2012-06-05 09:15:02.524408100 +0200 @@ -39,7 +39,7 @@ include protocol PContent; include protocol PBrowser; -include "nspr/prtime.h"; +include "prtime.h"; include "mozilla/HalSensor.h"; include "mozilla/HalTypes.h"; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2012 15:30:34 -0000 1.17 +++ .cvsignore 5 Jun 2012 18:14:12 -0000 1.18 @@ -1,2 +1,2 @@ -thunderbird-12.0.source.tar.bz2 -enigmail-1.4.1.tar.gz +enigmail-1.4.2.tar.gz +thunderbird-13.0.source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 28 Apr 2012 15:30:34 -0000 1.18 +++ sources 5 Jun 2012 18:14:12 -0000 1.19 @@ -1,2 +1,2 @@ -7b30b72472a65bce74ba0ae60e4d4e6c thunderbird-12.0.source.tar.bz2 -0eba75fbcf8f0bb32d538df102fbb8e9 enigmail-1.4.1.tar.gz +ed608e1cd4cd20b96f7f5afdbf081141 enigmail-1.4.2.tar.gz +0134c67c30e8598f2a64ea004d5bc4bc thunderbird-13.0.source.tar.bz2 Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- thunderbird-enigmail.spec 1 May 2012 07:44:47 -0000 1.23 +++ thunderbird-enigmail.spec 5 Jun 2012 18:14:12 -0000 1.24 @@ -14,9 +14,10 @@ %global sqlite_version 3.7.10 %global libnotify_version 0.4 %global libvpx_version 1.0.0 +%global _default_patch_fuzz 2 -%global thunver 12.0 -%global thunmax 13.0 +%global thunver 13.0 +%global thunmax 14.0 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -34,11 +35,11 @@ Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 1.4.1 +Version: 1.4.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+ @@ -66,15 +67,12 @@ Patch8: xulrunner-10.0-secondary-ipc.patch # Build patches -Patch102: mozilla-733867-x.patch -Patch103: mozilla-file.patch Patch104: xulrunner-10.0-gcc47.patch +Patch105: xulrunner-prtime.patch + # Linux specific Patch200: thunderbird-8.0-enable-addons.patch -# ARM Specific -Patch210: mozilla-724615.patch - %if %{official_branding} # Required by Mozilla Corporation @@ -85,6 +83,7 @@ %endif BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: nss-static BuildRequires: nss-devel >= %{nss_version} BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libnotify-devel >= %{libnotify_version} @@ -148,13 +147,11 @@ cd mozilla %patch7 -p2 -b .static %patch8 -p3 -b .secondary-ipc -%patch103 -p1 -b .mozilla-file %patch104 -p1 -b .gcc47 +%patch105 -p1 -b .prtime cd .. -%patch102 -p1 -b .733867 %patch200 -p1 -b .addons -%patch210 -p1 -b .724615 %if %{official_branding} # Required by Mozilla Corporation @@ -259,6 +256,9 @@ # ===== Enigmail work ===== pushd mailnews/extensions/enigmail ./makemake -r +popd + +pushd objdir/mailnews/extensions/enigmail make make xpi popd @@ -270,8 +270,7 @@ cd %{tarballdir} mkdir -p %{buildroot}%{enigmail_extname} - -unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d %{buildroot}%{enigmail_extname} +unzip -q objdir/mozilla/dist/bin/enigmail-*-linux-*.xpi -d %{buildroot}%{enigmail_extname} %files @@ -281,6 +280,9 @@ #=============================================================================== %changelog +* Tue Jun 05 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.4.2-1 +- Enigmail 1.4.2 for Thunderbird 13.0 + * Tue May 01 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.4.1-2 - spec cleanups Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thunderbird-mozconfig 28 Apr 2012 15:30:34 -0000 1.8 +++ thunderbird-mozconfig 5 Jun 2012 18:14:12 -0000 1.9 @@ -1,6 +1,6 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png xulrunner-10.0-gcc47.patch: Makefile.in | 3 +++ 1 file changed, 3 insertions(+) Index: xulrunner-10.0-gcc47.patch =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/xulrunner-10.0-gcc47.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xulrunner-10.0-gcc47.patch 28 Apr 2012 15:30:34 -0000 1.2 +++ xulrunner-10.0-gcc47.patch 5 Jun 2012 18:14:12 -0000 1.3 @@ -1,15 +1,3 @@ -diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc ---- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500 -+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500 -@@ -14,6 +14,8 @@ - #include <time.h> - #endif - -+#include <unistd.h> -+ - #include <limits> - - #include "base/basictypes.h" diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in --- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500 +++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500 --- mozilla-724615.patch DELETED --- --- mozilla-733867-x.patch DELETED --- --- mozilla-file.patch DELETED ---