[libhif/f21] Fix auto-importing of GPG keys during installing

[Richard Hughes]

commit 1ce3cc071f53769c570d09239a2293f57082ba1d
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jan 14 14:58:48 2015 +0000

    Fix auto-importing of GPG keys during installing

 0001-Fix-unintentional-change.patch |   25 +++++++++++++++++++++++++
 libhif.spec                         |   10 +++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-unintentional-change.patch b/0001-Fix-unintentional-change.patch
new file mode 100644
index 0000000..c68653f
--- /dev/null
+++ b/0001-Fix-unintentional-change.patch
@@ -0,0 +1,25 @@
+From f0c6c5695c11f994245e1a54553d1a7dbb51a251 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Thu, 8 Jan 2015 11:27:52 +0000
+Subject: [PATCH] Fix unintentional change in commit dbe03ed
+
+Resolves: https://github.com/hughsie/libhif/issues/13
+---
+ libhif/hif-transaction.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libhif/hif-transaction.c b/libhif/hif-transaction.c
+index 305b56c..8239036 100644
+--- a/libhif/hif-transaction.c
++++ b/libhif/hif-transaction.c
+@@ -1300,6 +1300,7 @@ hif_transaction_commit (HifTransaction *transaction,
+ 		goto out;
+ 
+ 	/* import all GPG keys */
++	ret = hif_keyring_add_public_keys (priv->keyring, error);
+ 	if (!ret)
+ 		goto out;
+ 
+-- 
+2.1.0
+
diff --git a/libhif.spec b/libhif.spec
index 3d01121..56195b5 100644
--- a/libhif.spec
+++ b/libhif.spec
@@ -1,11 +1,14 @@
 Summary:   Simple package library built on top of hawkey and librepo
 Name:      libhif
 Version:   0.1.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   LGPLv2+
 URL:       https://github.com/hughsie/libhif
 Source0:   http://people.freedesktop.org/~hughsient/releases/libhif-%{version}.tar.xz
 
+# already upstream
+Patch1:    0001-Fix-unintentional-change.patch
+
 BuildRequires: glib2-devel >= 2.16.1
 BuildRequires: libtool
 BuildRequires: docbook-utils
@@ -29,6 +32,7 @@ GLib headers and libraries for libhif.
 
 %prep
 %setup -q
+%patch1 -p1 -b .fix-gpg-import
 
 %build
 %configure \
@@ -61,6 +65,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libhif*.la
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Fri Dec 19 2014 Richard Hughes <richard at hughsie.com> 0.1.7-2
+- Fix auto-importing of GPG keys during installing
+- Resolves: #1182090 and #1182156
+
 * Fri Dec 19 2014 Richard Hughes <richard at hughsie.com> 0.1.7-1
 - Update to new upstream version
 - Add the concept of metadata-only software sources