[thunderbird-enigmail] Enigmail 1.7

[Remi Collet]

commit 19c1c1f58b872776a9edd3889cdcac9db7c87dd8
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Jul 15 16:15:45 2014 +0200

    Enigmail 1.7

 .gitignore                |    1 +
 sources                   |    2 +-
 thunderbird-enigmail.spec |   17 +++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 907b3fc..8a9730a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 /enigmail-1.7-611bc95.tar.gz
 /enigmail-1.7-c429d03.tar.gz
+/enigmail-1.7.tar.gz
diff --git a/sources b/sources
index 3ce5688..4b0201d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b146c59577032434b9e7a16b60656ab3  enigmail-1.7-c429d03.tar.gz
+d938c9ffe5e6992525a8c13aac6f8df6  enigmail-1.7.tar.gz
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index a43d8d2..d9ab123 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -13,14 +13,14 @@
 
 %global enigmail_extname   %{_libdir}/mozilla/extensions/%{thunderbird_app_id}/%{enimail_app_id}
 
-%global gitcommit          c429d039d54c4c1c02b0201c3ed128397390bf18
-%global gitdate            20140709
-%global gitshort           %(c=%{gitcommit}; echo ${c:0:7})
+#global gitcommit          c429d039d54c4c1c02b0201c3ed128397390bf18
+#global gitdate            20140709
+#global gitshort           %(c=%{gitcommit}; echo ${c:0:7})
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
 Name:           thunderbird-enigmail
 Version:        1.7
-Release:        0.3.%{gitdate}git%{gitshort}%{?dist}
+Release:        1%{?dist}
 URL:            http://enigmail.mozdev.org/
 # All files licensed under MPL 1.1/GPL 2.0/LGPL 2.1
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -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-1.7/ --output ../enigmail-1.7-c429d03.tar.gz --verbose  master
+# git archive --format=tar.gz --prefix enigmail/ --output ../enigmail-1.7-c429d03.tar.gz --verbose  master
 Source0:        enigmail-%{version}-%{gitshort}.tar.gz
 %else
 Source0:        http://www.mozilla-enigmail.org/download/source/enigmail-%{version}.tar.gz
@@ -48,11 +48,13 @@ features provided by GnuPG
 
 
 %prep
-%setup -q -n enigmail-%{version}
+%setup -q -n enigmail
 
+%if 0%{?gitdate}
 # Fix displayed version
 sed -e '/em:version/s/1.7/1.7pre/' \
     -i package/install.rdf
+%endif
 
 
 %build
@@ -83,6 +85,9 @@ find $RPM_BUILD_ROOT%{enigmail_extname} \
 #===============================================================================
 
 %changelog
+* Tue Jul 15 2014 Remi Collet <remi at fedoraproject.org> 1.7-1
+- Enigmail 1.7
+
 * Fri Jul 11 2014 Remi Collet <remi at fedoraproject.org> 1.7-0.3.20140709gitc429d03
 - test build, new snapshot
 - disable parallel build (broken)