rpms/thunderbird-enigmail/F-16 mozilla-724615.patch, NONE, 1.1 mozilla-733867-x.patch, NONE, 1.1 mozilla-file.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 thunderbird-enigmail.spec, 1.22, 1.23 thunderbird-mozconfig, 1.7, 1.8 mozilla-722127.patch, 1.1, NONE

Remi Collet remi at rpmfusion.org
Sat Apr 28 22:13:32 CEST 2012 

Author: remi

Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17301

Modified Files:
	.cvsignore sources thunderbird-enigmail.spec 
	thunderbird-mozconfig 
Added Files:
	mozilla-724615.patch mozilla-733867-x.patch mozilla-file.patch 
Removed Files:
	mozilla-722127.patch 
Log Message:
Enigmail 1.4.1 for Thunderbird 12.0

mozilla-724615.patch:
 objs.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mozilla-724615.patch ---
# HG changeset patch
# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
# User Raúl Porcel <armin76 at gentoo.org>
Bug XXXXXX - Fix TARGET_CPU usage on ARM


diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
--- a/mozilla/xpcom/glue/objs.mk
+++ b/mozilla/xpcom/glue/objs.mk
@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS =      \
   SSE.cpp                        \
   unused.cpp                     \
   nsProxyRelease.cpp             \
   nsTextFormatter.cpp            \
   GenericFactory.cpp             \
   FileUtils.cpp                  \
   $(NULL)
 
-ifeq (arm,$(TARGET_CPU))
+ifneq (,$(filter arm%,$(TARGET_CPU)))
 XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
 endif
 
 XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))

mozilla-733867-x.patch:
 base/search/src/nsMsgSearchAdapter.cpp  |    2 +-
 base/src/nsMsgFolderCompactor.cpp       |    4 ++--
 compose/src/nsSmtpProtocol.cpp          |    5 ++---
 imap/src/nsImapMailFolder.cpp           |    2 +-
 imap/src/nsImapProtocol.cpp             |   28 ++++++++++++++--------------
 imap/src/nsImapServerResponseParser.cpp |    2 +-
 local/src/nsPop3Protocol.cpp            |    2 +-
 mime/src/mimedrft.cpp                   |    2 +-
 mime/src/mimemult.cpp                   |   10 +++++-----
 9 files changed, 28 insertions(+), 29 deletions(-)

--- NEW FILE mozilla-733867-x.patch ---
diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
--- comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867	2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-04-25 10:51:32.343536178 +0200
@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
     PL_strcat(encoding, "{");
     lengthStr.AppendInt((PRInt32) strlen(value));
     PL_strcat(encoding, lengthStr.get());
-    PL_strcat(encoding, "}"CRLF);
+    PL_strcat(encoding, "}" CRLF);
     PL_strcat(encoding, value);
     return NS_OK;
   }
diff -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
--- comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867	2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-04-25 10:51:33.208535909 +0200
@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns
           }
         }
       }
-#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
 
        // if status offset isn't in the first block, this code won't work. There's no good reason
       // for the status offset not to be at the beginning of the message anyway.
@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila
         // check if there's an envelope header; if not, write one.
         if (strncmp(m_dataBuffer, "From ", 5))
         {
-          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
           m_offlineMsgSize += bytesWritten;
         }
       }
diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
--- comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867	2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-04-25 10:51:33.365535861 +0200
@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
 {
   m_sendDone = true;
   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
   m_nextState = SMTP_RESPONSE;
   m_nextStateAfterResponse = SMTP_DONE;
   return(0);
@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
     {
       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
       // send a quit command to close the connection with the server.
-      if (SendData(url, "QUIT"CRLF) == NS_OK)
+      if (SendData(url, "QUIT" CRLF) == NS_OK)
       {
         m_nextState = SMTP_RESPONSE;
         m_nextStateAfterResponse = SMTP_ERROR_DONE;
@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC
     NS_ENSURE_SUCCESS(rv,rv);
     return rv;
 }
-
diff -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release/mailnews/imap/src/nsImapMailFolder.cpp
--- comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867	2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-04-25 10:51:33.367535861 +0200
@@ -8309,7 +8309,7 @@ nsImapMailFolder::CopyFileToOfflineStore
           bool needMoreData = false;
           char * newLine = nsnull;
           PRUint32 numBytesInLine = 0;
-          const char *envelope = "From "CRLF;
+          const char *envelope = "From " CRLF;
           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
           fileSize += bytesWritten;
           do
diff -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/mailnews/imap/src/nsImapProtocol.cpp
--- comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867	2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-04-25 10:51:33.370535858 +0200
@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses
 {
   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
   nsCAutoString commandBuffer(GetServerCommandTag());
-  commandBuffer.Append(" IDLE"CRLF);
+  commandBuffer.Append(" IDLE" CRLF);
 
   do
   {
@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c
     commandString.Append(messageIds);
     commandString.Append(" (");
     commandString.Append(attribute);
-    commandString.Append(")"CRLF);
+    commandString.Append(")" CRLF);
     nsresult rv = SendData(commandString.get());
 
     if (NS_SUCCEEDED(rv))
@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge()
 
   IncrementCommandTagNumber();
   nsCAutoString command(GetServerCommandTag());
-  command.Append(" expunge"CRLF);
+  command.Append(" expunge" CRLF);
 
   nsresult rv = SendData(command.get());
   if (NS_SUCCEEDED(rv))
@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID()
   command.Append(gAppName);
   command.Append("\" \"version\" \"");
   command.Append(gAppVersion);
-  command.Append("\")"CRLF);
+  command.Append("\")" CRLF);
 
   nsresult rv = SendData(command.get());
   if (NS_SUCCEEDED(rv))
@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const
     nsCAutoString correctedPassword;
     EscapeUserNamePasswordString(password.get(), &correctedPassword);
     command.Append(correctedPassword);
-    command.Append("\""CRLF);
+    command.Append("\"" CRLF);
     rv = SendData(command.get(), true /* suppress logging */);
     NS_ENSURE_SUCCESS(rv, rv);
     ParseIMAPandCheckForNewMail();
@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const
   nsCString command(GetServerCommandTag());
   command += " create \"";
   command += escapedName;
-  command += "\""CRLF;
+  command += "\"" CRLF;
 
   nsresult rv = SendData(command.get());
   if(NS_SUCCEEDED(rv))
@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma
   nsCString command (GetServerCommandTag());
   command += " lsub \"\" \"";
   command += escapedPattern;
-  command += "\""CRLF;
+  command += "\"" CRLF;
 
   PR_Free(boxnameWithOnlineDirectory);
 
@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma
   command += useXLIST ?
     " xlist \"\" \"" : " list \"\" \"";
   command += escapedPattern;
-  command += "\""CRLF;
+  command += "\"" CRLF;
 
   PR_Free(boxnameWithOnlineDirectory);
 
@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha
   nsCString command (GetServerCommandTag());
   command += " subscribe \"";
   command += escapedName;
-  command += "\""CRLF;
+  command += "\"" CRLF;
 
   nsresult rv = SendData(command.get());
   if (NS_SUCCEEDED(rv))
@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c
   nsCString command (GetServerCommandTag());
   command += " unsubscribe \"";
   command += escapedName;
-  command += "\""CRLF;
+  command += "\"" CRLF;
 
   nsresult rv = SendData(command.get());
   if (NS_SUCCEEDED(rv))
@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle()
   if (m_urlInProgress)
     return;
   nsCAutoString command (GetServerCommandTag());
-  command += " IDLE"CRLF;
+  command += " IDLE" CRLF;
   nsresult rv = SendData(command.get());
   if (NS_SUCCEEDED(rv))
   {
@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo
   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
   if (asyncInputStream)
     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
-  nsresult rv = SendData("DONE"CRLF);
+  nsresult rv = SendData("DONE" CRLF);
   // set a short timeout if we don't want to wait for a response
   if (m_transport && !waitForResponse)
     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m
   PRUint32 msgsHandled = 0;
   const char *formatString;
   formatString = (idsAreUid)
-      ? "%s uid store %s %s"CRLF
-      : "%s store %s %s"CRLF;
+      ? "%s uid store %s %s" CRLF
+      : "%s store %s %s" CRLF;
 
   do
   {
diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
--- comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867	2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-04-25 10:51:33.374535858 +0200
@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
   
   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
-  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
   if (sendingIdleDone)
     fWaitingForMoreClientInput = false;
 
diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/mailnews/local/src/nsPop3Protocol.cpp
--- comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867	2012-04-21 00:32:40.000000000 +0200
+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-04-25 10:51:33.375535858 +0200
@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
         return(MK_OUT_OF_MEMORY);
     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
     m_listpos = 0;
-    return SendData(m_url, "LIST"CRLF);
+    return SendData(m_url, "LIST" CRLF);
 }
 
 
diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnews/mime/src/mimedrft.cpp
--- comm-release/mailnews/mime/src/mimedrft.cpp.733867	2012-04-21 00:32:40.000000000 +0200
+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-04-25 10:51:33.376535858 +0200
@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
                 *newbody = 0;
                 PL_strcatn(newbody, newbodylen, "<PRE>");
                 PL_strcatn(newbody, newbodylen, body);
-                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
                 PR_Free(body);
                 body = newbody;
               }
diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnews/mime/src/mimemult.cpp
--- comm-release/mailnews/mime/src/mimemult.cpp.733867	2012-04-21 00:32:40.000000000 +0200
+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-04-25 10:52:45.835512632 +0200
@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
             MimeWriteAString(obj, fileName);
-            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
             MimeWriteAString(obj, obj->options->state->detachedFilePath);
             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li
             status = MimeWriteAString(obj, header);
             if (status < 0) 
               return status;
-            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
             MimeWriteAString(obj, fileName);
-            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
           }
           nsCString result;
           char timeBuffer[128];
@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
                                  "%a %b %d %H:%M:%S %Y",
                                  &now);
           MimeWriteAString(obj, nsDependentCString(timeBuffer));
-          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
         }
         PRInt32 old_nchildren = container->nchildren;

mozilla-file.patch:
 file_util_linux.cc       |    3 +++
 message_pump_libevent.cc |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE mozilla-file.patch ---
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"


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	16 Mar 2012 06:13:26 -0000	1.17
+++ .cvsignore	28 Apr 2012 20:13:32 -0000	1.18
@@ -1,2 +1,2 @@
-enigmail-1.4.tar.gz
-thunderbird-11.0.source.tar.bz2
+thunderbird-12.0.source.tar.bz2
+enigmail-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	16 Mar 2012 06:13:26 -0000	1.18
+++ sources	28 Apr 2012 20:13:32 -0000	1.19
@@ -1,2 +1,2 @@
-5cf3d9720ed1cda1b22eabe5457772c2  enigmail-1.4.tar.gz
-1d7127a3282e62d95eb9b59d47291b70  thunderbird-11.0.source.tar.bz2
+7b30b72472a65bce74ba0ae60e4d4e6c  thunderbird-12.0.source.tar.bz2
+0eba75fbcf8f0bb32d538df102fbb8e9  enigmail-1.4.1.tar.gz


Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- thunderbird-enigmail.spec	16 Mar 2012 06:13:26 -0000	1.22
+++ thunderbird-enigmail.spec	28 Apr 2012 20:13:32 -0000	1.23
@@ -1,7 +1,7 @@
 %define debug_build       0
 
 # Use system Librairies ?
-%if 0%{?fedora} <= 15
+%if 0%{?fedora} <= 17
 %define system_sqlite 0
 %else
 %define system_sqlite 1
@@ -13,14 +13,14 @@
 %define nss_version 3.13.3
 %define cairo_version 1.10.0
 %define freetype_version 2.1.9
-%define sqlite_version 3.7.7.1
+%define sqlite_version 3.7.10
 %define libnotify_version 0.4
 %global libvpx_version 1.0.0
 
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
 
-%global thunver  11.0
-%global thunmax  12.0
+%global thunver  12.0
+%global thunmax  13.0
 
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
@@ -38,11 +38,11 @@
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
 Name:           thunderbird-enigmail
-Version:        1.4
+Version:        1.4.1
 %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+
@@ -70,12 +70,15 @@
 Patch8:         xulrunner-10.0-secondary-ipc.patch
 
 # Build patches
-Patch100:       xulrunner-10.0-gcc47.patch
-Patch101:       mozilla-722127.patch
-
+Patch102:       mozilla-733867-x.patch
+Patch103:       mozilla-file.patch
+Patch104:       xulrunner-10.0-gcc47.patch
 # Linux specific
 Patch200:       thunderbird-8.0-enable-addons.patch
 
+# ARM Specific 
+Patch210: 	mozilla-724615.patch
+
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -152,13 +155,13 @@
 cd mozilla
 %patch7 -p2 -b .static
 %patch8 -p3 -b .secondary-ipc
-%if 0%{?fedora} >= 17
-%patch100 -p1 -b .gcc47
-%endif
-%patch101 -p2 -b .722127
+%patch103 -p1 -b .mozilla-file
+%patch104 -p1 -b .gcc47
 cd ..
+%patch102 -p1 -b .733867
 
 %patch200 -p1 -b .addons
+%patch210 -p1 -b .724615
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -211,7 +214,7 @@
 # All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
 # the next major version would be). This is because I create builds from trunk
 # and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5pre/%{version}/' package/install.rdf
 grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
 # Apply Enigmail patch here
 popd
@@ -277,7 +280,6 @@
 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
 
 
 %clean
@@ -292,6 +294,12 @@
 #===============================================================================
 
 %changelog
+* Sat Apr 28 2012 Remi Collet <remi at fedoraproject.org> 1.4.1-1
+- Enigmail 1.4.1 for Thunderbird 12.0
+
+* Fri Mar 16 2012 Remi Collet <remi at fedoraproject.org> 1.4-3
+- Latest Thunderbird patch from rahwide
+
 * Thu Mar 15 2012 Remi Collet <remi at fedoraproject.org> 1.4-2
 - Enigmail 1.4 for Thunderbird 11.0
 


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-mozconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird-mozconfig	16 Mar 2012 06:13:26 -0000	1.7
+++ thunderbird-mozconfig	28 Apr 2012 20:13:32 -0000	1.8
@@ -21,7 +21,8 @@
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+# temporary disable system cairo, because compilation fails
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-system-hunspell


--- mozilla-722127.patch DELETED ---

More information about the rpmfusion-commits mailing list