From 244f693247b2e784f87c03681a34eadf1227234b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 2 Mar 2017 20:16:47 -0500
Subject: [PATCH] Add patch to bump requires for ostree

---
 ...ostree-2017.2-drop-check-for-gpg-sym.patch | 59 +++++++++++++++++++
 rpm-ostree.spec                               |  6 +-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 0001-build-Depend-on-ostree-2017.2-drop-check-for-gpg-sym.patch

diff --git a/0001-build-Depend-on-ostree-2017.2-drop-check-for-gpg-sym.patch b/0001-build-Depend-on-ostree-2017.2-drop-check-for-gpg-sym.patch
new file mode 100644
index 0000000..7b5a3b3
--- /dev/null
+++ b/0001-build-Depend-on-ostree-2017.2-drop-check-for-gpg-sym.patch
@@ -0,0 +1,59 @@
+From a2ac7531be72e31248b21441aa16275769826427 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 2 Mar 2017 20:10:28 -0500
+Subject: [PATCH] build: Depend on ostree 2017.2, drop check for gpg symbol
+
+Since somehow it's breaking in [Fedora's Koji](https://kojipkgs.fedoraproject.org//packages/rpm-ostree/2017.2/2.fc25/data/logs/x86_64/build.log)
+and I don't feel like debugging it.  Let's just take a hard dependency
+now and kill the conditional.
+
+Closes: https://github.com/projectatomic/rpm-ostree/issues/653
+---
+ configure.ac                             | 7 +------
+ src/daemon/rpmostreed-deployment-utils.c | 4 ----
+ 2 files changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b088b89..e3f0b82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,7 +81,7 @@ AC_SEARCH_LIBS([rpmsqSetInterruptSafety], [rpmio],
+ # Remember to update AM_CPPFLAGS in Makefile.am when bumping GIO req.
+ PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0])
+ PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 >= 2.40.0 json-glib-1.0
+-				     ostree-1 >= 2016.7
++				     ostree-1 >= 2017.2
+ 				     libsystemd
+ 				     rpm librepo
+ 				     libarchive])
+@@ -89,11 +89,6 @@ dnl bundled libdnf
+ PKGDEP_RPMOSTREE_CFLAGS="-I $(pwd)/libdnf -I $(pwd)/libdnf-build $PKGDEP_RPMOSTREE_CFLAGS"
+ PKGDEP_RPMOSTREE_LIBS="-L$(pwd)/libdnf-build/libdnf -ldnf $PKGDEP_RPMOSTREE_LIBS"
+ 
+-save_LIBS=$LIBS
+-LIBS=$PKGDEP_RPMOSTREE_LIBS
+-AC_CHECK_FUNCS(ostree_repo_verify_commit_for_remote)
+-LIBS=$save_LIBS
+-
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ 
+ GLIB_TESTS
+diff --git a/src/daemon/rpmostreed-deployment-utils.c b/src/daemon/rpmostreed-deployment-utils.c
+index e0f615e..42a990a 100644
+--- a/src/daemon/rpmostreed-deployment-utils.c
++++ b/src/daemon/rpmostreed-deployment-utils.c
+@@ -98,11 +98,7 @@ rpmostreed_deployment_gpg_results (OstreeRepo *repo,
+   if (!gpg_verify)
+     goto out;
+ 
+-#ifdef HAVE_OSTREE_REPO_VERIFY_COMMIT_FOR_REMOTE
+   result = ostree_repo_verify_commit_for_remote (repo, csum, remote, NULL, &error);
+-#else
+-  result = ostree_repo_verify_commit_ext (repo, csum, NULL, NULL, NULL, &error);
+-#endif
+   if (!result)
+       goto out;
+ 
+-- 
+2.9.3
+
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index f462f27..4213c4e 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -1,7 +1,7 @@
 Summary: Client side upgrade program and server side compose tool
 Name: rpm-ostree
 Version: 2017.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
 Source0: rpm-ostree-%{version}.tar.xz
@@ -29,6 +29,7 @@ BuildRequires: libattr-devel
 BuildRequires: pkgconfig(librepo)
 
 Patch0: 0001-build-Deal-with-gperf-3.1-changing-to-size_t.patch
+Patch1: 0001-build-Depend-on-ostree-2017.2-drop-check-for-gpg-sym.patch
 
 # libhif bundling
 # We're using RPATH to pick up our bundled version
@@ -129,6 +130,9 @@ python autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Fri Mar 03 2017 Colin Walters <walters@verbum.org> - 2017.2-5
+- Add patch to bump requires for ostree
+
 * Mon Feb 27 2017 Colin Walters <walters@verbum.org> - 2017.2-4
 - Add requires on ostree