From 597f7f513483363455def222195f023e838e2324 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 4 Feb 2020 16:57:27 -0500
Subject: [PATCH] git master snapshot for Silverblue rawhide compose fixes

https://pagure.io/releng/failed-composes/issue/717
https://pagure.io/releng/failed-composes/issue/929
https://github.com/rpm-software-management/libdnf/pull/885
---
 .gitignore                                    |  1 +
 ...e-Mark-all-repos-as-modular-hotfixes.patch | 38 -------------------
 rpm-ostree.spec                               | 12 ++++--
 sources                                       |  2 +-
 4 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 0001-core-Mark-all-repos-as-modular-hotfixes.patch

diff --git a/.gitignore b/.gitignore
index 8de5015..933673f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@
 /rpm-ostree-2019.6.24.gfec61ce5.tar.xz
 /rpm-ostree-2019.6.27.g3b8a1ec6.tar.xz
 /rpm-ostree-2019.7.tar.xz
+/rpm-ostree-2019.7.31.g70c38563.tar.xz
diff --git a/0001-core-Mark-all-repos-as-modular-hotfixes.patch b/0001-core-Mark-all-repos-as-modular-hotfixes.patch
deleted file mode 100644
index 7554e28..0000000
--- a/0001-core-Mark-all-repos-as-modular-hotfixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2966afe44eaa24d143af4cac02d9a84cb343aa3b Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 7 Jan 2020 17:25:12 -0500
-Subject: [PATCH] core: Mark all repos as "modular hotfixes"
-
-This is a follow-up hack to #1797 to force libdnf to let us use modular
-packages as if they were regular packages until we actually support
-modules correctly (#1435).
-
-A repo marked as a modular hotfix means that libdnf doesn't try to
-filter out modular RPMs from the repo as it usually does.
-
-Resolves: https://pagure.io/releng/failed-composes/issue/717
----
- src/libpriv/rpmostree-core.c |  6 ++++++
- 2 files changed, 6 insertions(+), 15 deletions(-)
-
-diff --git a/src/libpriv/rpmostree-core.c b/src/libpriv/rpmostree-core.c
-index 5ec673db..b0e7150a 100644
---- a/src/libpriv/rpmostree-core.c
-+++ b/src/libpriv/rpmostree-core.c
-@@ -1158,6 +1158,12 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
-    * So for now, let's tell libdnf that we do want to be able to see them. See:
-    * https://github.com/projectatomic/rpm-ostree/issues/1435 */
-   dnf_sack_set_module_excludes (dnf_context_get_sack (self->dnfctx), NULL);
-+  /* And also mark all repos as hotfix repos so that we can indiscriminately cherry-pick
-+   * from modular repos and non-modular repos alike. */
-+  g_autoptr(GPtrArray) repos =
-+    rpmostree_get_enabled_rpmmd_repos (self->dnfctx, DNF_REPO_ENABLED_PACKAGES);
-+  for (guint i = 0; i < repos->len; i++)
-+    dnf_repo_set_module_hotfixes (repos->pdata[i], TRUE);
- 
-   return TRUE;
- }
- 
--- 
-2.24.1
-
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 557f0cb..48508bf 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,8 +3,8 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2019.7
-Release: 3%{?dist}
+Version: 2019.7.31.g70c38563
+Release: 1%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  If rust is enabled, it contains vendored sources.
@@ -12,8 +12,6 @@ Source0: rpm-ostree-%{version}.tar.xz
 License: LGPLv2+
 URL: https://github.com/projectatomic/rpm-ostree
 
-Patch0: 0001-core-Mark-all-repos-as-modular-hotfixes.patch
-
 ExclusiveArch: %{rust_arches}
 
 %if 0%{?fedora}
@@ -192,6 +190,12 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* Tue Feb 04 2020 Jonathan Lebon <jonathan@jlebon.com> - 2019.7.31.g70c38563-1
+- git master snapshot for Silverblue rawhide compose fixes
+  https://pagure.io/releng/failed-composes/issue/717
+  https://pagure.io/releng/failed-composes/issue/929
+  https://github.com/rpm-software-management/libdnf/pull/885
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index d829bb7..68e4b0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2019.7.tar.xz) = e8521becb63df176a125b5407594352af09b2a7ce422b5274c3eec8124fe3ecf20b135739851d254a73018c1aded380651d93b3f2c8b61ac555279e58f3880c9
+SHA512 (rpm-ostree-2019.7.31.g70c38563.tar.xz) = 73149e06a70115d08c85c1e480807f41566b556cf2278e4cbeeee6cb8f9f3e16a57a76d527fa569c3888b2d2be4711d94c971a5b213a5cf0c5362263821346da