Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv1436 Modified Files: .cvsignore sources thunderbird-enigmail.spec xulrunner-10.0-gcc47.patch Removed Files: enigmail-fixlang.php Log Message: Enigmail 1.4 for Thunderbird 10.0 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 31 Jan 2012 19:41:16 -0000 1.15 +++ .cvsignore 3 Mar 2012 19:34:34 -0000 1.16 @@ -1,2 +1,2 @@ thunderbird-10.0.source.tar.bz2 -enigmail-1.3.5.tar.gz +enigmail-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 31 Jan 2012 19:41:16 -0000 1.16 +++ sources 3 Mar 2012 19:34:34 -0000 1.17 @@ -1,2 +1,2 @@ 6f76f25894ba746a2e33614d3dd8dbab thunderbird-10.0.source.tar.bz2 -1b008b0d106e238c11e4bead08126bc0 enigmail-1.3.5.tar.gz +5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- thunderbird-enigmail.spec 31 Jan 2012 19:41:16 -0000 1.20 +++ thunderbird-enigmail.spec 3 Mar 2012 19:34:34 -0000 1.21 @@ -32,7 +32,7 @@ Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 1.3.5 +Version: 1.4 %if 0%{?prever:1} Release: 0.1.%{prever}%{?dist} %else @@ -57,9 +57,6 @@ 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 - # Mozilla (XULRunner) patches Patch0: thunderbird-install-dir.patch @@ -117,7 +114,7 @@ BuildRequires: GConf2-devel ## For fixing lang -BuildRequires: dos2unix, php-cli +BuildRequires: perl # Without this enigmmail will require libxpcom.so and other .so @@ -206,9 +203,7 @@ pushd mailnews/extensions/enigmail for rep in $(cat lang/current-languages.txt) do - dos2unix lang/$rep/enigmail.dtd - dos2unix lang/$rep/enigmail.properties - php %{SOURCE101} ui/locale/en-US lang/$rep + perl util/fixlang.pl ui/locale/en-US lang/$rep done popd @@ -259,16 +254,16 @@ %install cd %{tarballdir} -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname} +mkdir -p $RPM_BUILD_ROOT%{enigmail_extname} -%{__unzip} -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname} -%{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh +unzip -q 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 +rm -rf $RPM_BUILD_ROOT %files @@ -279,6 +274,10 @@ #=============================================================================== %changelog +* Sat Mar 03 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.4-1 +- Enigmail 1.4 for Thunderbird 10.0 +- using upstream fixlang.pl instead of our fixlang.php + * Tue Jan 31 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.3.5-1 - Enigmail 1.3.5 for Thunderbird 10.0 xulrunner-10.0-gcc47.patch: ipc/chromium/src/base/file_util.cc | 2 +- ipc/chromium/src/base/file_util_linux.cc | 3 +++ ipc/chromium/src/base/message_pump_libevent.cc | 3 +++ ipc/chromium/src/base/time_posix.cc | 2 ++ toolkit/crashreporter/client/Makefile.in | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-) Index: xulrunner-10.0-gcc47.patch =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/xulrunner-10.0-gcc47.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xulrunner-10.0-gcc47.patch 31 Jan 2012 19:41:16 -0000 1.1 +++ xulrunner-10.0-gcc47.patch 3 Mar 2012 19:34:34 -0000 1.2 @@ -23,3 +23,41 @@ ifeq ($(OS_ARCH),WINNT) CPPSRCS += crashreporter_win.cpp LIBS += \ +diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc +--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100 ++++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100 +@@ -5,6 +5,9 @@ + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> +diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc +--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100 ++++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100 +@@ -6,6 +6,9 @@ + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" +diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc +--- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100 ++++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100 +@@ -8,7 +8,7 @@ + #include <io.h> + #endif + #include <stdio.h> +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(OS_POSIX) + #include <unistd.h> + #endif + --- enigmail-fixlang.php DELETED ---