.gitignore

@@ -1 +1 @@
-SOURCES/rpm-ostree-2024.9.tar.xz
+SOURCES/rpm-ostree-2024.7.tar.xz

.rpm-ostree.metadata

@@ -1 +1 @@
-beb849e668b6562aeec2e07b452581d122410249 SOURCES/rpm-ostree-2024.9.tar.xz
+d9cceab814a10d116e41911a00ca5d5134715da1 SOURCES/rpm-ostree-2024.7.tar.xz

SOURCES/0001-core-Fix-Coverity-WRAPPER_ESCAPE.patch

@@ -0,0 +1,33 @@
+From 96ddae1acba59cf5249dcfff1157e44b5ed69650 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 15 Aug 2024 11:41:43 -0400
+Subject: [PATCH 1/1] core: Fix Coverity WRAPPER_ESCAPE
+
+This should fix:
+
+```
+32. rpm-ostree-2024.7/src/libpriv/rpmostree-core.cxx:1786:15: use_after_free: Using internal representation of destroyed object temporary of type "std::string".
+```
+
+Signed-off-by: Colin Walters <walters@verbum.org>
+---
+ src/libpriv/rpmostree-core.cxx | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libpriv/rpmostree-core.cxx b/src/libpriv/rpmostree-core.cxx
+index a2de7262..615e2636 100644
+--- a/src/libpriv/rpmostree-core.cxx
++++ b/src/libpriv/rpmostree-core.cxx
+@@ -1782,7 +1782,8 @@ rpmostree_context_prepare (RpmOstreeContext *self, gboolean enable_filelists,
+           auto pkg = "";
+           for (auto &pkg_str : packages)
+             {
+-              pkg = std::string (pkg_str).c_str ();
++              auto pkg_buf = std::string (pkg_str);
++              pkg = pkg_buf.c_str ();
+               char *query = strchr ((char *)pkg, '/');
+               if (query)
+                 {
+-- 
+2.46.0
+

SPECS/rpm-ostree.spec

@@ -1,22 +1,44 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.6.5)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 2;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
 # The canonical copy of this spec file is upstream at:
 # https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2024.9
+Version: 2024.7
-Release: 1%{?dist}
+Release: %autorelease
-License: LGPLv2+
+License: LGPL-2.0-or-later
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  It also contains vendored Rust sources.
 Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
 
+Patch0: 0001-core-Fix-Coverity-WRAPPER_ESCAPE.patch
+
 ExclusiveArch: %{rust_arches}
 
+# ostree not on i686 for RHEL 10
+# https://github.com/containers/composefs/pull/229#issuecomment-1838735764
+%if 0%{?rhel} >= 10
+ExcludeArch:    %{ix86}
+%endif
+
 BuildRequires: make
+%if 0%{?rhel}
+BuildRequires: rust-toolset
+%else
 BuildRequires: rust-packaging
 BuildRequires: cargo
 BuildRequires: rust
+%endif
 
 # Enable ASAN + UBSAN
 %bcond_with sanitizers
@@ -56,6 +78,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)
@@ -130,7 +154,7 @@ Requires: fuse
 
 # For container functionality
 # https://github.com/coreos/rpm-ostree/issues/3286
-Recommends: skopeo
+Requires: skopeo
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -156,7 +180,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 The %{name}-devel package includes the header files for %{name}-libs.
 
 %prep
-%autosetup -Sgit -n %{name}-%{version}
+%autosetup -Sgit -n %{name}-%{version} -p1
 %if 0%{?__isa_bits} == 32
 sed -ie 's,^lto = true,lto = false,' Cargo.toml
 %endif
@@ -173,6 +197,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"
@@ -229,180 +258,248 @@ $PYTHON autofiles.py > files.devel \
   '%{_datadir}/gtk-doc/html/*' \
   '%{_datadir}/gir-1.0/*-1.0.gir'
 
+# Setup rpm-ostree-countme.timer according to presets
 %post
+%systemd_post rpm-ostree-countme.timer
 # Only enable on rpm-ostree based systems and manually force unit enablement to
 # explicitly ignore presets for this security fix
 if [ -e /run/ostree-booted ]; then
     ln -snf /usr/lib/systemd/system/rpm-ostree-fix-shadow-mode.service  /usr/lib/systemd/system/multi-user.target.wants/
 fi
 
+%preun
+%systemd_preun rpm-ostree-countme.timer
+
+%postun
+%systemd_postun_with_restart rpm-ostree-countme.timer
+
 %files -f files
 %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
 
 %changelog
-* Thu Nov 21 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.9-1
+## START: Generated by rpmautospec
-- Rebase to 2024.9
+* Thu Aug 15 2024 Joseph Marrero <jmarrero@redhat.com> - 2024.7-2
-  Resolves: #RHEL-68144
-
-* Thu Oct 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-3
-- Backport https://github.com/coreos/rpm-ostree/pull/5114
-  Resolves: #RHEL-62652
-
-* Thu Aug 15 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-2
 - Backport https://github.com/coreos/rpm-ostree/pull/5051
-  Resolves: #RHEL-53871
 
-* Tue Aug 09 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-1
+* Wed Aug 14 2024 Joseph Marrero <jmarrero@redhat.com> - 2024.7-1
-- Rebase to 2024.7
+- Release 2024.7
-  Resolves: #RHEL-53871
 
-* Tue May 21 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.5-1
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2024.6-2
-- Rebase to 2024.6
+- Bump release for June 2024 mass rebuild
-  Resolves: #RHEL-29339
 
-* Mon Apr 15 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.5-1
+* Tue May 21 2024 Joseph Marrero <jmarrero@redhat.com> - 2024.6-1
-- Rebase to 2024.5
+- Release 2024.6
-  Adds fix for https://github.com/coreos/rpm-ostree/security/advisories/GHSA-2m76-cwhg-7wv6
-  Resolves: #RHEL-30415
 
-* Tue Apr 09 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.4-4
+* Tue Apr 16 2024 Joseph Marrero Corchado <jmarrero@redhat.com> - 2024.5-1
-- Backport https://github.com/coreos/rpm-ostree/security/advisories/GHSA-2m76-cwhg-7wv6
+- Resolves #RHEL-30414
 
-* Thu Mar 21 2024 Colin Walters <walters@verbum.org> - 2024.4-3
+* Tue Apr 16 2024 Joseph Marrero Corchado <jmarrero@redhat.com> - 2024.2-2
-- Backport patch to fix https://issues.redhat.com/browse/RHEL-29559
+- Add gating yaml
 
-* Fri Mar 15 2024 Colin Walters <walters@verbum.org> - 2024.4-2
+* Thu Jan 25 2024 Joseph Marrero <jmarrero@redhat.com> - 2024.2-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2024.4
+- Release 2024.2
-  Resolves: #RHEL-29339
 
-* Sun Feb 25 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.3-1
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2024.1-4
-- https://github.com/coreos/rpm-ostree/releases/tag/v2024.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-  Backport https://github.com/coreos/rpm-ostree/commit/fe586621e5014d14f92b913338171a02ed29e6cc
-  Resolves: #RHEL-26186
 
-* Wed Jan 24 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.2-1
+* Tue Jan 02 2024 Colin Walters <walters@verbum.org> - 2024.1-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2024.2
-  Resolves: #RHEL-11294
-
-* Wed Jan 03 2024 Colin Walters <walters@verbum.org> - 2024.1-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2024.1
-  Resolves: #RHEL-11294
 
 * Mon Dec 18 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.12-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.12
-  Resolves: #RHEL-11294
 
-* Wed Dec 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.11-1
+* Wed Nov 29 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.11-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.11
-  Resolves: #RHEL-11294
 
-* Thu Oct 05 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.8-3
+* Wed Nov 15 2023 Timothée Ravier <tim@siosm.fr> - 2023.10-4
-- Use python macros and devel package
+- Setup rpm-ostree-countme.timer according to presets
-  Resolves: #RHEL-11892
+
+* Thu Oct 26 2023 Colin Walters <walters@verbum.org> - 2023.10-3
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.10
 
-* Mon Oct 02 2023 Colin Walters <walters@verbum.org> - 2023.8-2
+* Wed Oct 04 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.8-3
+- Update python3 macros and dependency.
+
+* Wed Sep 27 2023 Colin Walters <walters@verbum.org> - 2023.8-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.8
-  https://issues.redhat.com/browse/RHEL-11294
 
-* Sat Aug 26 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.7-1
+* Tue Aug 29 2023 Colin Walters <walters@verbum.org> - 2023.6-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.7
-  Resolves: rhbz#2234352
-
-* Fri Aug 25 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.6-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.6
-  Resolves: rhbz#2234352
 
-* Fri Jul 21 2023 Colin Walters <walters@verbum.org> - 2023.5-2
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.5-2
-- Backport https://github.com/coreos/rpm-ostree/pull/4510
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-  Related: rhbz#2224081
 
-* Thu Jun 22 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.5-1
+* Wed Jun 21 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.5-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.5
-  Resolves: rhbz#2216811
 
-* Tue Jun 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.4-1
+* Tue Jun 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.4-5
+- Switch License tags to SPDX
+
+* Thu May 25 2023 Adam Williamson <awilliam@redhat.com> - 2023.4-4
+- Backport libdnf patches to work with rpm-4.19
+
+* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 2023.4-3
+- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
+
+* Thu May 18 2023 Colin Walters <walters@verbum.org> - 2023.4-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.4
-  Resolves: rhbz#2211486
 
 * Mon Apr 24 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.3-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.3
-  Resolves: rhbz#2189315
 
 * Tue Mar 07 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.2-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.2
-  Resolves: rhbz#2176213
 
-* Tue Dec 20 2022 Colin Walters <walters@verbum.org> - 2022.19-3
+* Thu Feb 16 2023 Colin Walters <walters@verbum.org> - 2023.1-4
+- Cherry pick
+  https://github.com/coreos/rpm-ostree/pull/4308/commits/476afb1d08513cb74cd1d28490c5e028c70f67c2
+
+* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 2023.1-3
+- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Jonathan Lebon <jonathan@jlebon.com> - 2023.1-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.1
+
+* Tue Dec 20 2022 Colin Walters <walters@verbum.org> - 2022.19-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.19
-  Resolves: rhbz#2153460
 
-* Wed Dec 14 2022 Colin Walters <walters@verbum.org> - 2022.18-2
+* Tue Dec 13 2022 Colin Walters <walters@verbum.org> - 2022.18-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.18
-  Resolves: rhbz#2153460
 
-* Tue Nov 22 2022 Colin Walters <walters@verbum.org> - 2022.16-2
+* Mon Dec 12 2022 Colin Walters <walters@verbum.org> - 2022.17-2
-- Rebase to 2022.16
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.17
-  Resolves: rhbz#2144586
+
+* Mon Nov 28 2022 Colin Walters <walters@verbum.org> - 2022.16-2
+- Cherry pick https://github.com/coreos/rpm-ostree/pull/4166
+
+* Fri Nov 18 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.16-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.16
+
+* Wed Nov 02 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.15-3
+- Backport semanage bug workaround
+  https://github.com/coreos/rpm-ostree/pull/4122
+
+* Tue Nov 01 2022 Colin Walters <walters@verbum.org> - 2022.15-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.15
 
 * Thu Oct 13 2022 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.14-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.14
 
-* Tue Sep 13 2022 Luca BRUNO <lucab@redhat.com> - 2022.13-1
+* Sat Aug 27 2022 Colin Walters <walters@verbum.org> - 2022.13-1
-- New upstream version
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.13
-  https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
+
-  Resolves: rhbz#2126108
+* Sun Aug 07 2022 Colin Walters <walters@verbum.org> - 2022.12-4
+- Cherry pick patch to work around filesystem package
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
 * Tue Jul 19 2022 Colin Walters <walters@verbum.org> - 2022.12-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
 
 * Mon Jul 11 2022 Colin Walters <walters@verbum.org> - 2022.11-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.11
-  Resolves: rhbz#2105405
 
-* Thu Jun 09 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.8-3
+* Thu Jun 16 2022 Colin Walters <walters@verbum.org> - 2022.10-3
-- Backport https://github.com/coreos/rpm-ostree/pull/3721
+- Backport https://github.com/coreos/rpm-ostree/pull/3771
-  Resolves: rhbz#2094085
+
+* Tue Jun 14 2022 Colin Walters <walters@verbum.org> - 2022.10-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.10
+
+* Fri May 13 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.9-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.9
 
-* Thu Apr 21 2022 Colin Walters <walters@verbum.org> - 2022.8-2
+* Wed Apr 20 2022 Colin Walters <walters@verbum.org> - 2022.8-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.8
-  Resolves: rhbz#2077062
-  Resolves: rhbz#2023325
 
 * Mon Apr 11 2022 Colin Walters <walters@verbum.org> - 2022.7-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.7
+- Rebase to 2022.7
 
-* Mon Feb 07 2022 Colin Walters <walters@verbum.org> - 2022.2-2
+* Fri Apr 08 2022 Colin Walters <walters@verbum.org> - 2022.6-2
-- Rebase to 2022.2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.6
 
-* Mon Jan 10 2022 Colin Walters <walters@verbum.org> - 2022.1-2
+* Thu Mar 24 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.5.80.gb7f91619
-- Rebase to 2022.1
+- Git snapshot for https://github.com/coreos/rpm-ostree/pull/3535
-  Resolves: rhbz#2027476
 
-* Wed Dec 01 2021 Colin Walters <walters@verbum.org> - 2021.14-3
+* Thu Mar 03 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.5-1
-- Drop zchunk dependency
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.5
-  Resolves: rhbz#2028167
 
-* Mon Nov 29 2021 Colin Walters <walters@verbum.org> - 2021.14-2
+* Tue Mar 01 2022 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.4-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.4
+
+* Mon Feb 28 2022 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.3-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.3
+
+* Thu Feb 03 2022 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.2-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.2
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 07 2022 Colin Walters <walters@verbum.org> - 2022.1-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.1
+
+* Wed Nov 17 2021 Colin Walters <walters@verbum.org> - 2021.14-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2021.14
-  Resolves: rhbz#2027476
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.6-2
+* Wed Nov 03 2021 Luca BRUNO <lucab@lucabruno.net> - 2021.13-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Backport patch to fix F35 rebases through DBus
-  Related: rhbz#1991688
+  https://github.com/coreos/rpm-ostree/pull/3199
+
+* Tue Nov 02 2021 Luca BRUNO <lucab@lucabruno.net> - 2021.13-1
+- New upstream version
+  https://github.com/coreos/rpm-ostree/releases/tag/v2021.13
+
+* Thu Oct 14 2021 Colin Walters <walters@verbum.org> - 2021.12-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.12
+
+* Thu Sep 30 2021 Colin Walters <walters@verbum.org> - 2021.11-3
+- Backport patch for openshift/os extensions + multiarch
+
+* Fri Sep 24 2021 Colin Walters <walters@verbum.org> - 2021.11-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2021.10-3
+- Rebuilt with OpenSSL 3.0.0
+
+* Fri Aug 27 2021 Colin Walters <walters@verbum.org> - 2021.10-2
+- Backport
+  https://github.com/coreos/rpm-ostree/pull/3095/commits/1d445170b97e8eaad6979b68f1c3ce3481c801ea
+
+* Thu Aug 26 2021 Jonathan Lebon <jonathan@jlebon.com> - 2021.10-1
+- New release v2021.10
+  https://github.com/coreos/rpm-ostree/releases/tag/v2021.10
+
+* Thu Aug 19 2021 Colin Walters <walters@verbum.org> - 2021.9-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.9
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 19 2021 Jonathan Lebon <jonathan@jlebon.com> - 2021.7-1
+- New release v2021.7
+  https://github.com/coreos/rpm-ostree/releases/tag/v2021.7
+
+* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 2021.6-3
+- Rebuild for versioned symbols in json-c
 
 * Tue Jun 22 2021 Colin Walters <walters@verbum.org>
 - https://github.com/coreos/rpm-ostree/releases/tag/v2021.6
 
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2021.5-3
+* Thu Jun 17 2021 Luca BRUNO <lucab@lucabruno.net> - 2021.5-2
-- Rebuilt for RHEL 9 BETA for openssl 3.0
+- Backport _dbpath fixes, see
-  Related: rhbz#1971065
+  https://github.com/coreos/rpm-ostree/issues/2904
-
-* Tue Jun 01 2021 Colin Walters <walters@verbum.org> - 2021.5-2
-- Support OpenSSL 3
 
 * Wed May 12 2021 Luca BRUNO <lucab@lucabruno.net> - 2021.5-1
 - New upstream version
@@ -417,9 +514,6 @@ fi
 * Tue Apr 27 2021 Colin Walters <walters@verbum.org> - 2021.4-2
 - Backport patch for https://pagure.io/fedora-infrastructure/issue/9909
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2021.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Mon Apr 12 2021 Jonathan Lebon <jonathan@jlebon.com> - 2021.4-1
 - https://github.com/coreos/rpm-ostree/releases/tag/v2021.4
 
@@ -1013,3 +1107,4 @@ fi
 * Fri Mar 07 2014 Colin Walters <walters@verbum.org> - 2014.5-1
 - Initial package
 
+## END: Generated by rpmautospec