From 1883a0b28cfda7ba92fe4cd55ab98e792d3b3bc7 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 21 Sep 2023 19:47:50 +0000
Subject: [PATCH] import CS ostree-2023.6-1.el9

---
 .gitignore        |  2 +-
 .ostree.metadata  |  2 +-
 SPECS/ostree.spec | 39 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff6ff1a..d302873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libostree-2022.6.tar.xz
+SOURCES/libostree-2023.6.tar.xz
diff --git a/.ostree.metadata b/.ostree.metadata
index 7909886..4099ae6 100644
--- a/.ostree.metadata
+++ b/.ostree.metadata
@@ -1 +1 @@
-0e80da51128314cbc8255ac4abc570b470478190 SOURCES/libostree-2022.6.tar.xz
+1f063c495ee29b92903c152fa410df96c80d5e25 SOURCES/libostree-2023.6.tar.xz
diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec
index 1cdcfa3..3054f05 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -1,4 +1,4 @@
-# Don't ship tests on RHEL > 7.
+# We haven't yet "productized" the tests
 %if 0%{?rhel} > 7
     %bcond_with tests
 %else
@@ -7,8 +7,8 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2022.6
-Release: 3%{?dist}
+Version: 2023.6
+Release: 1%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 Source1: ostree-readonly-sysroot-migration
 Source2: ostree-readonly-sysroot-migration.service
@@ -107,6 +107,7 @@ env NOCONFIGURE=1 ./autogen.sh
            --with-selinux \
            --with-curl \
            --with-openssl \
+           --with-composefs \
            %{?with_tests:--enable-installed-tests=exclusive} \
            --with-dracut=yesbutnoconf
 %make_build
@@ -141,7 +142,6 @@ find %{buildroot} -name '*.la' -delete
 %{_prefix}/lib/systemd/system-generators/ostree-system-generator
 %exclude %{_sysconfdir}/grub.d/*ostree
 %exclude %{_libexecdir}/libostree/grub2*
-%exclude %{_libexecdir}/libostree/ostree-trivial-httpd
 %{_prefix}/lib/tmpfiles.d/*
 %{_prefix}/lib/ostree
 # Moved in git master
@@ -174,10 +174,39 @@ find %{buildroot} -name '*.la' -delete
 %files tests
 %{_libexecdir}/installed-tests
 %{_datadir}/installed-tests
-%{_libexecdir}/libostree/ostree-trivial-httpd
 %endif
 
 %changelog
+* Fri Aug 25 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.6-1
+- https://github.com/ostreedev/ostree/releases/tag/v2023.6
+  Resolves: rhbz#2234351
+
+* Fri Aug 4 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.5-1
+- https://github.com/ostreedev/ostree/releases/tag/v2023.5
+  backport: https://github.com/ostreedev/ostree/commit/7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f
+  Resolves: rhbz#2221997
+
+* Wed Jun 28 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.4-2
+- Add patch https://github.com/ostreedev/ostree/pull/2901
+  Resolves: rhbz#2216810
+
+* Thu Jun 22 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.4-1
+- https://github.com/ostreedev/ostree/releases/tag/v2023.4
+  Resolves: rhbz#2216810
+
+* Tue Jun 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.3-1
+- https://github.com/ostreedev/ostree/releases/tag/v2023.3
+  Resolves: rhbz#2211487
+
+* Thu Mar 23 2023 Colin Walters <walters@verbum.org> - 2023.2-2
+- https://github.com/ostreedev/ostree/releases/tag/v2023.2
+  Resolves: rhbz#2172898
+
+* Thu Feb 23 2023 Colin Walters <walters@verbum.org> - 2023.1-2
+- Update to 2023.1
+  Resolves: rhbz#2172898
+  xref https://issues.redhat.com/browse/COS-2069
+
 * Thu Feb 9 2023 Sayan Paul <saypaul@redhat.com> - 2022.6-3
 - Resolves: rhbz#2167344