[thunderbird-enigmail/epel7] Enigmail 1.8

[Remi Collet]

commit d11a49bc0884503f70ee5d2aa07f18264e63d3ac
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Mar 18 06:48:18 2015 +0100

    Enigmail 1.8
    
    (cherry picked from commit 94865c4fcd1d7dca427b5ea99119d07c63ccfa39)

 .gitignore                |  2 ++
 sources                   |  2 +-
 thunderbird-enigmail.spec | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea51378..bc06ec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ clog
 /enigmail-1.7-c429d03.tar.gz
 /enigmail-1.7.tar.gz
 /enigmail-1.7.2.tar.gz
+/enigmail-1.8-d77065b.tar.gz
+/enigmail-1.8.tar.gz
diff --git a/sources b/sources
index a754718..b1cac58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d506093139dbeed51c70f00dfe308bc2  enigmail-1.7.2.tar.gz
+e8baac0c3a564ca1bd3df880651b1eca  enigmail-1.8.tar.gz
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index 13313e1..8df1269 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -1,25 +1,25 @@
 # spec file for thunderbird-enigmail
 #
-# Copyright (c) 2009-2014 Remi Collet
+# Copyright (c) 2009-2015 Remi Collet
 # License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 %global enimail_app_id     \{847b3a00-7ab1-11d4-8f02-006008948af5\}
 
-%global thunmin            24.0
+%global thunmin            31.0
 
 %global enigmail_extname   %{_libdir}/mozilla/extensions/%{thunderbird_app_id}/%{enimail_app_id}
 
-#global gitcommit          c429d039d54c4c1c02b0201c3ed128397390bf18
-#global gitdate            20140709
+#global gitcommit          d77065b0c1ddae7a666827e9a83fb728b303503d
+#global gitdate            20150227
 #global gitshort           %(c=%{gitcommit}; echo ${c:0:7})
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
 Name:           thunderbird-enigmail
-Version:        1.7.2
+Version:        1.8
 Release:        1%{?dist}
 URL:            http://enigmail.mozdev.org/
 # All files licensed under MPL 1.1/GPL 2.0/LGPL 2.1
@@ -28,7 +28,7 @@ Group:          Applications/Internet
 %if 0%{?gitdate}
 # git clone git://git.code.sf.net/p/enigmail/source enigmail-source
 # cd enigmail-source; git checkout c429d03
-# git archive --format=tar.gz --prefix enigmail/ --output ../enigmail-1.7-c429d03.tar.gz --verbose  master
+# git archive --format=tar.gz --prefix enigmail/ --output ../enigmail-1.8-d77065b.tar.gz --verbose  master
 Source0:        enigmail-%{version}-%{gitshort}.tar.gz
 %else
 Source0:        http://www.mozilla-enigmail.org/download/source/enigmail-%{version}.tar.gz
@@ -50,11 +50,8 @@ features provided by GnuPG
 %prep
 %setup -q -n enigmail
 
-%if 0%{?gitdate}
-# Fix displayed version
-sed -e '/em:version/s/1.7/1.7pre/' \
+sed -e '/em:version/s/1.8a1pre/%{version}/' \
     -i package/install.rdf
-%endif
 
 
 %build
@@ -83,6 +80,9 @@ find $RPM_BUILD_ROOT%{enigmail_extname} \
 #===============================================================================
 
 %changelog
+* Tue Mar 17 2015 Remi Collet <remi at fedoraproject.org> 1.8-1
+- Enigmail 1.8
+
 * Fri Aug 29 2014 Remi Collet <remi at fedoraproject.org> 1.7.2-1
 - Enigmail 1.7.2, fix CVE-2014-5369