remi pushed to thunderbird-enigmail (f20). "Enigmail 1.8.2 (bugfix) (..more)"

[notifications at fedoraproject.org]

>From ea4e2cada2d163803023e7e9751bd928e17d2ae1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 17 Apr 2015 07:22:55 +0200
Subject: Enigmail 1.8.2 (bugfix)

(cherry picked from commit 73f3c0300b1bb406bc9721c4d3e94689c4cfadf9)

diff --git a/.gitignore b/.gitignore
index 7b07ecb..c9988fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /enigmail-1.8-d77065b.tar.gz
 /enigmail-1.8.tar.gz
 /enigmail-1.8.1.tar.gz
+/enigmail-1.8.2.tar.gz
diff --git a/sources b/sources
index 9daed60..9215596 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50d46bcd5e02292aee902878b6cbd5a6  enigmail-1.8.1.tar.gz
+4a7adbdb6e79e0ef3e81f0805b617c34  enigmail-1.8.2.tar.gz
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index 8a63bc1..88a3328 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -19,7 +19,7 @@
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
 Name:           thunderbird-enigmail
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 URL:            http://enigmail.mozdev.org/
 # All files licensed under MPL 1.1/GPL 2.0/LGPL 2.1
@@ -50,8 +50,13 @@ features provided by GnuPG
 %prep
 %setup -q -n enigmail
 
-#sed -e '/em:version/s/1.8a1pre/%{version}/' \
-#    -i package/install.rdf
+RDF=package/install.rdf
+
+grep "em:version" $RDF
+grep "em:min"     $RDF
+sed -e '/em:version/s/>[1-9].*</>%{version}</' -i $RDF
+
+grep -q "<em:version>%{version}</em:version>"  $RDF || exit 1
 
 
 %build
@@ -80,6 +85,9 @@ find $RPM_BUILD_ROOT%{enigmail_extname} \
 #===============================================================================
 
 %changelog
+* Fri Apr 17 2015 Remi Collet <remi at fedoraproject.org> 1.8.2-1
+- Enigmail 1.8.2
+
 * Mon Mar 23 2015 Remi Collet <remi at fedoraproject.org> 1.8.1-1
 - Enigmail 1.8.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/thunderbird-enigmail.git/commit/?h=f20&id=ea4e2cada2d163803023e7e9751bd928e17d2ae1