[pgp-tools/f20] Fix error in gpg-key2ps (#1121353)

[Jochen Schmitt]

commit 1745742f9b07afb8ba95a3708f17b3a7a792a566
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Aug 23 14:38:35 2014 +0200

    Fix error in gpg-key2ps (#1121353)

 pgp-tools-1.1.5-key2ps.patch |   12 ++++++++++++
 pgp-tools.spec               |   13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/pgp-tools-1.1.5-key2ps.patch b/pgp-tools-1.1.5-key2ps.patch
new file mode 100644
index 0000000..2df5350
--- /dev/null
+++ b/pgp-tools-1.1.5-key2ps.patch
@@ -0,0 +1,12 @@
+diff -up signing-party-1.1.5/gpg-key2ps/gpg-key2ps.bak signing-party-1.1.5/gpg-key2ps/gpg-key2ps
+--- signing-party-1.1.5/gpg-key2ps/gpg-key2ps.bak	2014-08-23 14:26:44.461034094 +0200
++++ signing-party-1.1.5/gpg-key2ps/gpg-key2ps	2014-08-23 14:28:19.104679028 +0200
+@@ -90,7 +90,7 @@ usage(\*STDERR, 1) unless scalar @ARGV >
+ my $w; my $h;
+ if ( `which paperconf` && $? == 0 ) {
+ 	$w=`paperconf -w | tr "," "."`;
+-	$h=`paperconf -h` | tr "," "."`;
++	$h=`paperconf -h | tr "," "."`;
+ 	chomp($w);
+ 	chomp($h);
+ } else {
diff --git a/pgp-tools.spec b/pgp-tools.spec
index 6ecd798..f33b6f2 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:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -10,6 +10,7 @@ URL:            http://pgp-tools.alioth.debian.org/
 Source0:        http://ftp.debian.org/debian/pool/main/s/%{tarballname}/%{tarballname}_%{debian_version}.orig.tar.gz
 Patch0:         %{name}-1.1-drop-pgpring.patch
 Patch1:		%{name}-1.1.4-paper.patch
+Patch2:         %{name}-1.1.5-key2ps.patch
 # for gpgdir test suite
 %if 0%{?fedora} > 18
 BuildRequires:  perl-podlators
@@ -49,6 +50,7 @@ This is a collection of several projects relating to OpenPGP.
 sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -115,6 +117,15 @@ exit $RC
 %doc __fedora_docs/*
 
 %changelog
+* Sat Aug 23 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.5-4
+- Fix error in gpg-key2ps (#1121353)
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Thu Mar  6 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.5-1
 - New upstream release, fix caff <keyid> issue (#10734121)