From 1814a6fc480a0e12cff184a8ca0c056781be2881 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 15 Oct 2019 14:05:30 -0400
Subject: [PATCH] Improve the merge logic to handle third-party repos more
 sanely

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 .gitignore        | 1 +
 libmodulemd1.spec | 7 +++++--
 sources           | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e32d1c..ee76198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /modulemd-1.8.15.tar.xz
+/modulemd-1.8.16.tar.xz
diff --git a/libmodulemd1.spec b/libmodulemd1.spec
index 87352e0..986bc68 100644
--- a/libmodulemd1.spec
+++ b/libmodulemd1.spec
@@ -1,6 +1,6 @@
 Name:           libmodulemd1
-Version:        1.8.15
-Release:        3%{?dist}
+Version:        1.8.16
+Release:        1%{?dist}
 Summary:        Module metadata manipulation library
 
 License:        MIT
@@ -112,6 +112,9 @@ export MMD_SKIP_VALGRIND=1
 
 
 %changelog
+* Tue Oct 15 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.8.16-1
+- Improve the merge logic to handle third-party repos more sanely
+
 * Tue Jul 30 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.8.15-3
 - Drop python2 subpackage
 
diff --git a/sources b/sources
index 6feb42f..150f93b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-1.8.15.tar.xz) = 57f69eca50451f954dbab3021f2b4a9de84999a35994fff2eae076f1c89cccfc60da789e5bf423a930dd44eda76ee5a5053f41d4d12b9126b88b953965ba7d84
+SHA512 (modulemd-1.8.16.tar.xz) = bb6728d4d22816d0263d2a3bb59be8b44ff841f2c9cf80228ce9e966cfd0c8dbf65bd731867729d2cb00b18123f51473939d69a23679644523e9f98b69d58a8c