From 86d4ae383b27e98dee44055afad53b520fba5f33 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 21 Jan 2020 16:00:27 -0500
Subject: [PATCH] import ostree-2019.6-2.el8

---
 .gitignore        |  2 +-
 .ostree.metadata  |  2 +-
 SPECS/ostree.spec | 46 +++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62612d8..85081fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libostree-2018.8.tar.xz
+SOURCES/libostree-2019.6.tar.xz
diff --git a/.ostree.metadata b/.ostree.metadata
index 1086948..b1bf305 100644
--- a/.ostree.metadata
+++ b/.ostree.metadata
@@ -1 +1 @@
-c8dabfe09e987a15d99e4723be23f23da9f7bbb3 SOURCES/libostree-2018.8.tar.xz
+afdb1c1aa53a466962fb24f106c6560604c2c5be SOURCES/libostree-2019.6.tar.xz
diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec
index 3c4703f..f1d0f83 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -7,7 +7,7 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2018.8
+Version: 2019.6
 Release: 2%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 License: LGPLv2+
@@ -43,6 +43,7 @@ BuildRequires:  bison
 Requires: dracut
 Requires: /usr/bin/gpgv2
 Requires: systemd-units
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 libostree is a shared library designed primarily for
@@ -57,7 +58,7 @@ The %{name}-libs provides shared libraries for %{name}.
 
 %package devel
 Summary: Development headers for %{name}
-Requires: %{name}-libs =  %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 The %{name}-devel package includes the header files for the %{name} library.
@@ -79,7 +80,8 @@ GRUB2 integration for OSTree
 %if %{with tests}
 %package tests
 Summary: Tests for the %{name} package
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tests
 This package contains tests that can be used to verify
@@ -97,8 +99,7 @@ env NOCONFIGURE=1 ./autogen.sh
            --with-curl \
            --with-openssl \
            %{?with_tests:--enable-installed-tests=exclusive} \
-           --with-dracut=yesbutnoconf \
-           --disable-http2
+           --with-dracut=yesbutnoconf
 %make_build
 
 %install
@@ -121,7 +122,7 @@ find %{buildroot} -name '*.la' -delete
 %{_datadir}/ostree
 %{_datadir}/bash-completion/completions/*
 %dir %{_prefix}/lib/dracut/modules.d/98ostree
-%{_prefix}/lib/systemd/system/ostree*.service
+%{_prefix}/lib/systemd/system/ostree*.*
 %{_prefix}/lib/dracut/modules.d/98ostree/*
 %{_mandir}/man*/*.gz
 %{_prefix}/lib/systemd/system-generators/ostree-system-generator
@@ -161,7 +162,38 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
-* Wed Oct 17 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.8-2
+* Tue Dec 10 2019 Colin Walters <walters@verbum.org> - 2019.6-2
+- https://github.com/ostreedev/ostree/releases/tag/v2019.6
+
+* Wed Oct 30 2019 Colin Walters <walters@verbum.org> - 2019.5-1
+- https://github.com/ostreedev/ostree/releases/tag/v2019.5
+
+* Mon Oct 14 2019 Colin Walters <walters@verbum.org> - 2019.4-3
+- https://github.com/ostreedev/ostree/releases/tag/v2019.4
+
+* Wed Apr 24 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.2-1
+- https://github.com/ostreedev/ostree/releases/tag/v2019.2
+
+* Sat Feb 09 2019 Dusty Mabe <dusty@dustymabe.com> - 2019.1-5
+- Re-enable http2 in ostree build
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 17 2019 Sinny Kumari <ksinny@gmail.com> - 2019.1-3
+- Backport patch to fix bare → bare imports
+- Backport patch to Set xattr on correct fd for bare-user → bare-user imports
+
+* Fri Jan 11 2019 Colin Walters <walters@verbum.org> - 2019.1-2
+- https://github.com/ostreedev/ostree/releases/tag/v2019.1
+
+* Fri Jan 11 2019 Colin Walters <walters@verbum.org> - 2018.9-2
+- Work around https://src.fedoraproject.org/rpms/nfs-utils/pull-request/7
+
+* Thu Oct 25 2018 Colin Walters <walters@verbum.org> - 2018.9-1
+- https://github.com/ostreedev/ostree/releases/tag/v2018.9
+
+* Wed Oct 17 2018 Jonathan Lebon <jonathan@jlebon.com>
 - Add conditional for tests and disable by default on RHEL > 7
 
 * Wed Aug 22 2018 Colin Walters <walters@verbum.org> - 2018.8-1