[pgp-tools/f21] Fix Unicode-issue (#1139704)

[Jochen Schmitt]

commit d0e332d7914dc659c741c9e3b9d9962a7dd1cad7
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Sep 10 16:32:42 2014 +0200

    Fix Unicode-issue (#1139704)

 pgp-tools-1.1.5-caff.patch |   13 +++++++++++++
 pgp-tools.spec             |   12 ++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/pgp-tools-1.1.5-caff.patch b/pgp-tools-1.1.5-caff.patch
new file mode 100644
index 0000000..16b8d89
--- /dev/null
+++ b/pgp-tools-1.1.5-caff.patch
@@ -0,0 +1,13 @@
+--- a/caff/caff	
++++ a/caff/caff	
+@@ -870,8 +870,8 @@ sub create_mail($$$@) {
+ 
+ 	$message_entity->head->add("Subject", "Your signed PGP key 0x$key_id");
+ 	$message_entity->head->add("To", $address);
+-	$message_entity->head->add("From", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>');
+-	$message_entity->head->add("Sender", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>');
++	$message_entity->head->add("From", '"'.Encode::encode('MIME-Q', Encode::decode_utf8($CONFIG{'owner'})).'" <'.$CONFIG{'email'}.'>');
++	$message_entity->head->add("Sender", '"'.Encode::encode('MIME-Q', Encode::decode_utf8($CONFIG{'owner'})).'" <'.$CONFIG{'email'}.'>');
+ 	$message_entity->head->add("Reply-To", $CONFIG{'reply-to'}) if defined $CONFIG{'reply-to'};
+ 	$message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'};
+ 	$message_entity->head->add("User-Agent", $USER_AGENT);
diff --git a/pgp-tools.spec b/pgp-tools.spec
index f33b6f2..a9e0f09 100644
--- a/pgp-tools.spec
+++ b/pgp-tools.spec
@@ -2,7 +2,7 @@
 %global debian_version 1.1.5
 Name:           pgp-tools
 Version:        %{debian_version}
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -11,6 +11,7 @@ Source0:        http://ftp.debian.org/debian/pool/main/s/%{tarballname}/%{tarbal
 Patch0:         %{name}-1.1-drop-pgpring.patch
 Patch1:		%{name}-1.1.4-paper.patch
 Patch2:         %{name}-1.1.5-key2ps.patch
+Patch3:		%{name}-1.1.5-caff.patch
 # for gpgdir test suite
 %if 0%{?fedora} > 18
 BuildRequires:  perl-podlators
@@ -28,7 +29,7 @@ Requires:      libpaper
 %description
 This is a collection of several projects relating to OpenPGP.
 
-* caff: CA - Fire and Forget signs and mails a key
+* caff: CAcr - Fire and Forget signs and mails a key
 * pgp-clean: removes all non-self signatures from key
 * pgp-fixkey: removes broken packets from keys
 * gpg-mailkeys: simply mail out a signed key to its owner
@@ -51,6 +52,7 @@ sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1 
 
 %build
 make %{?_smp_mflags}
@@ -117,6 +119,12 @@ exit $RC
 %doc __fedora_docs/*
 
 %changelog
+* Wed Sep 10 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.5-6
+- Fix Unicode-issue (#1139704)
+
+* Tue Sep 02 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.1.5-5
+- Perl 5.20 rebuild
+
 * Sat Aug 23 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.5-4
 - Fix error in gpg-key2ps (#1121353)