[python-gnupg] * Thu Apr 17 2014 Paul Wouters <pwouters at redhat.com> - 0.3.6-2 - Re-instate part of export patch tha

[Paul Wouters]

commit 0dad306283a306b005cbcde7e47d03f2f29d86e0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 17 18:48:24 2014 -0400

    * Thu Apr 17 2014 Paul Wouters <pwouters at redhat.com> - 0.3.6-2
    - Re-instate part of export patch that fixed encoding bug

 python-gnupg-0.3.6-encoding.patch |   12 ++++++++++++
 python-gnupg.spec                 |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/python-gnupg-0.3.6-encoding.patch b/python-gnupg-0.3.6-encoding.patch
new file mode 100644
index 0000000..02b44c3
--- /dev/null
+++ b/python-gnupg-0.3.6-encoding.patch
@@ -0,0 +1,12 @@
+--- python-gnupg-0.3.6-orig/gnupg.py	2013-08-30 13:10:36.000000000 -0400
++++ python-gnupg-0.3.6/gnupg.py	2013-12-31 16:31:11.044804846 -0500
+@@ -1011,7 +1017,8 @@
+         result = self.result_map['delete'](self) # any result will do
+         self._collect_output(p, result, stdin=p.stdin)
+         logger.debug('export_keys result: %r', result.data)
+-        return result.data.decode(self.encoding, self.decode_errors)
++        #return result.data.decode(self.encoding, self.decode_errors)
++        return result.data
+ 
+     def list_keys(self, secret=False):
+         """ list the keys currently in the keyring
diff --git a/python-gnupg.spec b/python-gnupg.spec
index 7cbfca2..3686165 100644
--- a/python-gnupg.spec
+++ b/python-gnupg.spec
@@ -1,11 +1,12 @@
 Name:           python-gnupg
 Version:        0.3.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python module for GnuPG
 Group:          Development/Languages
 License:        BSD
 URL:            http://pythonhosted.org/python-gnupg/
 Source0:        https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch1:         python-gnupg-0.3.6-encoding.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -16,6 +17,7 @@ GnuPG bindings for python. This uses the gpg command.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python2} setup.py build
@@ -29,6 +31,9 @@ GnuPG bindings for python. This uses the gpg command.
 %{python_sitelib}/python_gnupg-%{version}-py*.egg-info
 
 %changelog
+* Thu Apr 17 2014 Paul Wouters <pwouters at redhat.com> - 0.3.6-2
+- Re-instate part of export patch that fixed encoding bug
+
 * Thu Feb 06 2014 Paul Wouters <pwouters at redhat.com> - 0.3.6-1
 - Updated to 0.3.6 which includes Security fix (CVE-2014-XXXX)
 - Upstream including our export patch and converted README file