Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/F-15 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5573 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/F-15/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 29 Apr 2012 08:08:17 -0000 1.16 +++ .cvsignore 6 Jun 2012 14:56:15 -0000 1.17 @@ -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/F-15/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 29 Apr 2012 08:08:17 -0000 1.19 +++ sources 6 Jun 2012 14:56:16 -0000 1.20 @@ -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/F-15/thunderbird-enigmail.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- thunderbird-enigmail.spec 29 Apr 2012 08:08:17 -0000 1.19 +++ thunderbird-enigmail.spec 6 Jun 2012 14:56:16 -0000 1.20 @@ -1,44 +1,41 @@ -%define debug_build 0 +%global debug_build 0 # Use system Librairies ? %if 0%{?fedora} <= 17 -%define system_sqlite 0 +%global system_sqlite 0 %else -%define system_sqlite 1 +%global system_sqlite 1 %endif -%define build_langpacks 1 - -%define nspr_version 4.9 -%define nss_version 3.13.3 -%define cairo_version 1.10.0 -%define freetype_version 2.1.9 -%define sqlite_version 3.7.10 -%define libnotify_version 0.4 +%global nspr_version 4.9 +%global nss_version 3.13.3 +%global cairo_version 1.10.0 +%global freetype_version 2.1.9 +%global sqlite_version 3.7.10 +%global libnotify_version 0.4 %global libvpx_version 1.0.0 +%global _default_patch_fuzz 2 -%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} - -%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. # # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' -#%define tarballdir . -%define tarballdir comm-release +#define tarballdir . +%global tarballdir comm-release -%define official_branding 1 +%global official_branding 1 -%define mozappdir %{_libdir}/thunderbird +%global mozappdir %{_libdir}/thunderbird %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.4.1 +Version: 1.4.2 %if 0%{?prever:1} Release: 0.1.%{prever}%{?dist} %else @@ -47,7 +44,7 @@ URL: http://enigmail.mozdev.org/ License: MPLv1.1 or GPLv2+ Group: Applications/Internet -Source0: thunderbird-%{thunver}%{?thunbeta}.source.tar.bz2 +Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{thunver}%{?pre_version}/... Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded @@ -70,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 @@ -88,8 +82,8 @@ %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: nss-static BuildRequires: nss-devel >= %{nss_version} BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libnotify-devel >= %{libnotify_version} @@ -117,9 +111,7 @@ BuildRequires: autoconf213 BuildRequires: desktop-file-utils BuildRequires: libcurl-devel -BuildRequires: yasm BuildRequires: mesa-libGL-devel -BuildRequires: GConf2-devel BuildRequires: libvpx-devel >= %{libvpx_version} ## For fixing lang @@ -155,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 @@ -266,6 +256,9 @@ # ===== Enigmail work ===== pushd mailnews/extensions/enigmail ./makemake -r +popd + +pushd objdir/mailnews/extensions/enigmail make make xpi popd @@ -275,25 +268,24 @@ %install cd %{tarballdir} -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{enigmail_extname} - -unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname} - - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{enigmail_extname} +unzip -q objdir/mozilla/dist/bin/enigmail-*-linux-*.xpi -d %{buildroot}%{enigmail_extname} %files -%defattr(-,root,root,-) %{enigmail_extname} #=============================================================================== %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 + * Sat Apr 28 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.4.1-1 - Enigmail 1.4.1 for Thunderbird 12.0 Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-mozconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thunderbird-mozconfig 29 Apr 2012 08:08:17 -0000 1.8 +++ thunderbird-mozconfig 6 Jun 2012 14:56:16 -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/F-15/xulrunner-10.0-gcc47.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xulrunner-10.0-gcc47.patch 29 Apr 2012 08:08:17 -0000 1.3 +++ xulrunner-10.0-gcc47.patch 6 Jun 2012 14:56:16 -0000 1.4 @@ -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 ---