From beb008cc796adae1a2b1cd17eebc2f7870df14f7 Mon Sep 17 00:00:00 2001
From: Joseph Marrero <jmarrero@redhat.com>
Date: Fri, 9 Aug 2024 13:46:14 -0400
Subject: [PATCH] Release 2024.7

Resolves: #RHEL-53872
---
 .gitignore      |  1 +
 rpm-ostree.spec | 13 ++++++++++++-
 sources         |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 247f176..96d5b56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,4 @@
 /rpm-ostree-2024.2.tar.xz
 /rpm-ostree-2024.5.tar.xz
 /rpm-ostree-2024.6.tar.xz
+/rpm-ostree-2024.7.tar.xz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index a87ad50..c8642cf 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,7 +3,7 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2024.6
+Version: 2024.7
 Release: %autorelease
 License: LGPL-2.0-or-later
 URL: https://github.com/coreos/rpm-ostree
@@ -66,6 +66,8 @@ BuildRequires: pkgconfig(libarchive)
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: libcap-devel
 BuildRequires: libattr-devel
+# Needed by the ostree-ext crate
+BuildRequires: libzstd-devel
 
 # We currently interact directly with librepo (libdnf below also pulls it in,
 # but duplicating to be clear)
@@ -183,6 +185,11 @@ export RUSTFLAGS="%{build_rustflags}"
   %{?with_rhsm:--enable-featuresrs=rhsm}
 
 %make_build
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%cargo_vendor_manifest
+%endif
 
 %install
 %make_install INSTALL="install -p -c"
@@ -258,6 +265,10 @@ fi
 %doc COPYING.GPL COPYING.LGPL LICENSE README.md
 
 %files libs -f files.lib
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%license LICENSE.dependencies
+%license cargo-vendor.txt
+%endif
 
 %files devel -f files.devel
 
diff --git a/sources b/sources
index 16cb6c2..0657073 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2024.6.tar.xz) = e02032741a0f46ca4bf06a57a54cf74f5a2ec293a1491bf6beb8e0cfbc0982deb57c6ba33edda092c4772603b979114dc14facf5af6aa7c48d27e80dd2e63669
+SHA512 (rpm-ostree-2024.7.tar.xz) = b74861d316929222479aa7751f6fcfe454fb9bb2ecaae3c54b25bf23140320efcc9a29e7e27ad62fd8e75e7f423bd26abbcd81d787506e83742c0455a75132e3