From 5f10c186fd30649b4bd4b3cdfa27e43da5872106 Mon Sep 17 00:00:00 2001
From: Thomas Perl <m@thp.io>
Date: Fri, 6 Feb 2015 16:33:43 +0100
Subject: [PATCH] [zypp] Add patch: Use GPG_BINARY in PublicKey.cc

---
 ...ey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch | 56 +++++++++++++++++++
 rpm/libzypp.spec                              |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 rpm/0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch

diff --git a/rpm/0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch b/rpm/0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch
new file mode 100644
index 0000000..7ba5dae
--- /dev/null
+++ b/rpm/0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch
@@ -0,0 +1,56 @@
+From 50ed977e1b166ba23a029f3a5194121ea4d45dd7 Mon Sep 17 00:00:00 2001
+From: Thomas Perl <m@thp.io>
+Date: Fri, 6 Feb 2015 16:28:43 +0100
+Subject: [PATCH] zypp/PublicKey.cc: Use GPG_BINARY from KeyRing.cc
+
+On systems where "gpg" is not available, checking the public key
+would fail. Use GPG_BINARY in both PublicKey.cc and KeyRing.cc,
+and define it in a single place only (ExternalProgram.h).
+---
+ zypp/ExternalProgram.h | 2 ++
+ zypp/KeyRing.cc        | 2 --
+ zypp/PublicKey.cc      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/zypp/ExternalProgram.h b/zypp/ExternalProgram.h
+index bc62a4c..46e8145 100644
+--- a/zypp/ExternalProgram.h
++++ b/zypp/ExternalProgram.h
+@@ -22,6 +22,8 @@
+ #include "zypp/base/ExternalDataSource.h"
+ #include "zypp/Pathname.h"
+ 
++#define GPG_BINARY "/usr/bin/gpg2"
++
+ namespace zypp {
+ 
+     /**
+diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
+index 13cae3d..a4dc447 100644
+--- a/zypp/KeyRing.cc
++++ b/zypp/KeyRing.cc
+@@ -37,8 +37,6 @@ using std::endl;
+ #undef  ZYPP_BASE_LOGGER_LOGGROUP
+ #define ZYPP_BASE_LOGGER_LOGGROUP "zypp::KeyRing"
+ 
+-#define GPG_BINARY "/usr/bin/gpg2"
+-
+ ///////////////////////////////////////////////////////////////////
+ namespace zypp
+ { /////////////////////////////////////////////////////////////////
+diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc
+index 4d3d773..52d9d7a 100644
+--- a/zypp/PublicKey.cc
++++ b/zypp/PublicKey.cc
+@@ -349,7 +349,7 @@ namespace zypp
+         static filesystem::TmpDir dir;
+         const char* argv[] =
+         {
+-          "gpg",
++          GPG_BINARY,
+           "-v",
+           "--no-default-keyring",
+           "--fixed-list-mode",
+-- 
+2.1.4
+
diff --git a/rpm/libzypp.spec b/rpm/libzypp.spec
index b617b2c..9be1033 100644
--- a/rpm/libzypp.spec
+++ b/rpm/libzypp.spec
@@ -6,6 +6,7 @@ Version:        14.35.0
 Release:        1
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
+Patch0:         0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch
 BuildRequires:  cmake
 BuildRequires:  openssl-devel
 BuildRequires:  libudev-devel
@@ -73,6 +74,7 @@ Authors:
 
 %prep
 %setup -q -n %{name}-%{version}/%{name}
+%patch0 -p1
 
 %build
 mkdir -p build