From e16e3759d031a871889d0f067a0e23cb3215dbac Mon Sep 17 00:00:00 2001
From: Joseph Marrero <jmarrero@redhat.com>
Date: Fri, 17 May 2024 09:25:13 -0400
Subject: [PATCH] Release 2024.6

Resolves: RHEL-35888
---
 .gitignore  |  1 +
 ostree.spec | 15 +++------------
 sources     |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9c5f95..c3b04fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,4 @@
 /libostree-2023.8.tar.xz
 /libostree-2024.1.tar.xz
 /libostree-2024.2.tar.xz
+/libostree-2024.6.tar.xz
diff --git a/ostree.spec b/ostree.spec
index 129e483..13daeda 100644
--- a/ostree.spec
+++ b/ostree.spec
@@ -4,15 +4,10 @@
 %else
     %bcond_without tests
 %endif
-%if 0%{?rhel} < 10
-    %bcond_with composefs
-%else
-    %bcond_without composefs
-%endif
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2024.2
+Version: 2024.6
 Release: %autorelease
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 License: LGPL-2.0-or-later
@@ -34,6 +29,7 @@ BuildRequires: gtk-doc
 BuildRequires: pkgconfig(zlib)
 BuildRequires: pkgconfig(libcurl)
 BuildRequires: openssl-devel
+BuildRequires: pkgconfig(composefs)
 %if %{with tests}
 BuildRequires: pkgconfig(libsoup-3.0)
 %endif
@@ -57,9 +53,6 @@ BuildRequires: pkgconfig(libsystemd)
 BuildRequires: /usr/bin/g-ir-scanner
 BuildRequires: dracut
 BuildRequires:  bison
-%if %{with composefs}
-BuildRequires: pkgconfig(composefs)
-%endif
 
 # Runtime requirements
 Requires: dracut
@@ -68,9 +61,7 @@ Requires: systemd-units
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 # Strictly speaking, this is not a current hard requirement, but it will
 # be in the future.
-%if %{with composefs}
 Requires: composefs
-%endif
 
 %description
 libostree is a shared library designed primarily for
@@ -126,7 +117,7 @@ env NOCONFIGURE=1 ./autogen.sh
            --with-curl \
            --with-openssl \
            --without-soup \
-           %{?with_composefs:--with-composefs} \
+           --with-composefs \
            %{?with_tests:--with-soup3} \
            %{?!with_tests:--without-soup3} \
            %{?with_tests:--enable-installed-tests=exclusive} \
diff --git a/sources b/sources
index 267e0eb..2c9635c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libostree-2024.2.tar.xz) = e6e3b1c3d59b54b43d4b58428f99080251921f999b7d3f96e67993d0a8e48031ff36fa04fc89db5ba46d24f78a329a165ad76379b18b96842c4b22c511b2f307
+SHA512 (libostree-2024.6.tar.xz) = ac1abcd9785e2bf61d99f441856ea3f403fbf0a6e2bec4703b386dab43b58f3e9792e1a40acf04742fc820b80014ff836d92c38bf4bbe0f0e6ebbe752a403618