6 changed files with 683 additions and 214 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz
+SOURCES/rpm-ostree-2026.1.tar.xz
--- a/.rpm-ostree.metadata
+++ b/.rpm-ostree.metadata
@ -1 +1 @@
-43d5b34cf6b8c77fc2f17429dcc1d385c885b032 SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz
+ad4f43651bbb8d8e8d2848820c8b123a886e10b7 SOURCES/rpm-ostree-2026.1.tar.xz
--- a/SOURCES/0001-override-Honor-install-in-container-case-too.patch
+++ b/SOURCES/0001-override-Honor-install-in-container-case-too.patch
@ -1,48 +0,0 @@
-From f340dbbfd6a3acc8b85d487a32a78c4517ace1c4 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 7 Dec 2022 20:14:06 -0500
-Subject: [PATCH] override: Honor `--install` in container case too
-
-Closes: https://github.com/coreos/rpm-ostree/issues/4192
---
- ci/test-container.sh                    | 8 ++++++--
- src/app/rpmostree-override-builtins.cxx | 1 +
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/ci/test-container.sh b/ci/test-container.sh
-index be0f9549..342808e4 100755
--- a/ci/test-container.sh
-+++ b/ci/test-container.sh
-@@ -84,11 +84,15 @@ rpm-ostree override replace --experimental --from repo=fedora-coreos-pool \
- 
- rpm -q afterburn-5.2.0-4.fc36.x86_64 afterburn-dracut-5.2.0-4.fc36.x86_64
- 
-# test repo override by pkgname
-rpm-ostree override replace --experimental \
-+# test repo override by pkgname, and also test --install
-+if rpm -q strace; then
-+  echo "strace should not be installed"; exit 1
-+fi
-+rpm-ostree override replace --install strace --experimental \
-   --from repo=copr:copr.fedorainfracloud.org:group_CoreOS:continuous \
-   afterburn \
-   afterburn-dracut
-+rpm -q strace
- 
- # the continuous build's version has the git rev, prefixed with g
- rpm -q afterburn | grep g
-diff --git a/src/app/rpmostree-override-builtins.cxx b/src/app/rpmostree-override-builtins.cxx
-index 41ab56f4..0c07ff53 100644
--- a/src/app/rpmostree-override-builtins.cxx
-+++ b/src/app/rpmostree-override-builtins.cxx
-@@ -204,6 +204,7 @@ handle_override (RPMOSTreeSysroot *sysroot_proxy, RpmOstreeCommandInvocation *in
-           CXX_TRY_VAR (pkgs, rpmostreecxx::stage_container_rpm_raw_fds (fds), error);
-           treefile->add_packages_override_replace_local (pkgs);
-         }
-+      treefile->add_packages (util::rust_stringvec_from_strv (install_pkgs), true);
-       treefile->add_packages_override_remove (util::rust_stringvec_from_strv (override_remove));
-       return rpmostree_container_rebuild (*treefile, cancellable, error);
-     }
-- 
-2.41.0
-
--- a/SOURCES/0001-rpmostreed-transaction-types-fix-override-reset.patch
+++ b/SOURCES/0001-rpmostreed-transaction-types-fix-override-reset.patch
@ -0,0 +1,173 @@
+From 993f2f8277ca01a5167e02f46ac6a962c98a3a12 Mon Sep 17 00:00:00 2001
+From: Joseph Marrero Corchado <jmarrero@redhat.com>
+Date: Wed, 28 Jan 2026 17:02:10 -0500
+Subject: [PATCH] rpmostreed-transaction-types: fix override reset
+
+PR #5510 introduced an early return optimization for container-based
+deployments to handle idempotent package layering. However, this early
+return checked only `remove_changed` (package removals) and not override
+changes, causing `rpm-ostree override reset --all` to silently return
+without staging a new deployment on container-based systems.
+
+The issue occurs because:
+1. `skip_base_check` is TRUE for container-based ostree hosts
+2. `no_overrides` (the -a flag) sets `changed = TRUE` but not `remove_changed`
+3. The early return condition `!remove_changed` was satisfied, skipping deployment
+
+This fix adds an `override_changed` tracking variable that is set when
+overrides are reset, and includes it in the early return condition. Now
+when `rpm-ostree override reset --all` is called, the deployment is
+properly staged.
+
+Also extends the idempotent-layering test to cover this scenario:
+- Performs a kernel override on a container-based deployment
+- Tests that `override reset --all` properly stages a new deployment
+- Verifies the pending deployment has no overrides
+
+This would have caught the regression introduced in PR #5510.
+
+Fixes: https://github.com/coreos/rpm-ostree/pull/5510
+Assisted-by: Claude (OpenCode)
+Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
+---
+ src/daemon/rpmostreed-transaction-types.cxx   | 17 ++++--
+ .../kolainst/destructive/idempotent-layering  | 59 ++++++++++++++++++-
+ 2 files changed, 68 insertions(+), 8 deletions(-)
+
+diff --git a/src/daemon/rpmostreed-transaction-types.cxx b/src/daemon/rpmostreed-transaction-types.cxx
+index 9937d4dd..e2002b28 100644
+--- a/src/daemon/rpmostreed-transaction-types.cxx
+++ b/src/daemon/rpmostreed-transaction-types.cxx
+@@ -1194,6 +1194,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction, GCancellable *ca
+ 
+   gboolean changed = FALSE;
+   gboolean remove_changed = FALSE;
+  gboolean override_changed = FALSE;
+   if (no_initramfs
+       && (rpmostree_origin_get_regenerate_initramfs (origin)
+           || rpmostree_origin_has_initramfs_etc_files (origin)))
+@@ -1329,7 +1330,10 @@ deploy_transaction_execute (RpmostreedTransaction *transaction, GCancellable *ca
+   if (no_overrides)
+     {
+       if (rpmostree_origin_remove_all_overrides (origin))
+-        changed = TRUE;
+        {
+          changed = TRUE;
+          override_changed = TRUE;
+        }
+     }
+   else if (override_reset_pkgs || override_replace_local_pkgs)
+     {
+@@ -1463,6 +1467,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction, GCancellable *ca
+             }
+         }
+       changed = TRUE;
+      override_changed = TRUE;
+     }
+   auto treefile = (const char *)vardict_lookup_ptr (self->modifiers, "treefile", "&s");
+   if (treefile && !rpmostree_origin_merge_treefile (origin, treefile, &changed, error))
+@@ -1591,10 +1596,12 @@ deploy_transaction_execute (RpmostreedTransaction *transaction, GCancellable *ca
+   /* When using containers and nothing changed after prep_layering, return early.
+    * This happens when all requested packages are already present in the container image.
+    * For idempotent mode, this avoids the "No packages in transaction" error.
+-   * However, if packages were removed from the origin, we need to deploy to update the origin
+-   * even if no layering is needed. Similarly, if we're rebasing (refspec) or deploying a
+-   * specific revision, we need to deploy. */
+-  if (skip_base_check && !layering_changed && !remove_changed && !self->refspec && !self->revision)
+   * However, if packages were removed from the origin, or overrides were reset, we need to
+   * deploy to update the origin even if no layering is needed. Similarly, if we're rebasing
+   * (refspec) or deploying a specific revision, we need to deploy. */
+  const bool origin_changed = layering_changed || remove_changed || override_changed;
+  const bool have_refspec_or_revision = self->refspec || self->revision;
+  if (skip_base_check && !origin_changed && !have_refspec_or_revision)
+     return TRUE;
+ 
+   if (dry_run)
+diff --git a/tests/kolainst/destructive/idempotent-layering b/tests/kolainst/destructive/idempotent-layering
+index 344a59ae..ae876d28 100755
+--- a/tests/kolainst/destructive/idempotent-layering
+++ b/tests/kolainst/destructive/idempotent-layering
+@@ -1,10 +1,11 @@
+ #!/bin/bash
+ ## kola:
+-##   # Increase timeout since this test involves rebasing and container operations
+-##   timeoutMin: 20
+##   # Increase timeout since this test involves rebasing, container operations,
+##   # and kernel override/reset which requires additional reboots
+##   timeoutMin: 30
+ ##   # This test only runs on FCOS
+ ##   distros: fcos
+-##   # Needs internet access for package installation
+##   # Needs internet access for package installation and koji access
+ ##   tags: "needs-internet platform-independent"
+ ##   minMemory: 2048
+ #
+@@ -33,6 +34,23 @@ set -x
+ 
+ cd "$(mktemp -d)"
+ 
+# Get Fedora version and set up kernel override URLs
+. /etc/os-release
+case "$VERSION_ID" in
+  42)
+    koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2693809"
+    kernel_release=6.14.1-300.fc42.x86_64
+    ;;
+  43)
+    koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2837146"
+    kernel_release=6.17.1-300.fc43.x86_64
+    ;;
+  *)
+    echo "Unsupported Fedora version: $VERSION_ID"
+    exit 1
+    ;;
+esac
+
+ # TODO: It'd be much better to test this via a registry
+ image_dir=/var/tmp/fcos
+ image=oci:$image_dir
+@@ -109,6 +127,41 @@ EOF
+     rpm -q vim-enhanced
+     echo "ok idempotent install of new package"
+ 
+    # Test 5: Override kernel on container-based deployment
+    # This tests that override replace works on container-based systems
+    current_kernel=$(uname -r)
+    echo "Current kernel: ${current_kernel}"
+
+    # Fail if already on target kernel - we need to test the override/reset flow
+    if [[ "${current_kernel}" == "${kernel_release}" ]]; then
+      fatal "Cannot test kernel override: current kernel ${current_kernel} already matches target ${kernel_release}"
+    fi
+    rpm-ostree override replace "${koji_kernel_url}"
+    rpmostree_assert_status '.deployments[0]["base-local-replacements"]|length > 0'
+    echo "ok kernel override on container-based deployment"
+
+    /tmp/autopkgtest-reboot 3
+    ;;
+  3)
+    # Verify override was applied
+    current_kernel=$(uname -r)
+    echo "Current kernel after reboot: ${current_kernel}"
+
+    # Test 6: Override reset --all on container-based deployment
+    # This is the critical test that was broken - override reset -a should
+    # actually stage a new deployment, not silently do nothing
+    echo "Testing override reset --all on container-based deployment..."
+
+    rpm-ostree override reset --all
+
+    # Verify that a new deployment was staged (not just silently returned)
+    # The pending deployment should have no overrides
+    # Note: We check >= 2 because ostree may keep additional rollback deployments
+    rpmostree_assert_status '.deployments|length >= 2'
+    rpmostree_assert_status '.deployments[0].staged == true'
+    rpmostree_assert_status '.deployments[0]["base-local-replacements"]|length == 0'
+    echo "ok override reset --all on container-based deployment"
+
+     ;;
+   *) echo "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}"; exit 1;;
+ esac
+-- 
+2.52.0
+
--- a/SOURCES/0002-scripts-also-ignore-kernel-debug-modules.posttrans.patch
+++ b/SOURCES/0002-scripts-also-ignore-kernel-debug-modules.posttrans.patch
@ -1,38 +0,0 @@
-From cb777d950511e29dcb822b4ccba23e43cd63e9cb Mon Sep 17 00:00:00 2001
-From: Joseph Marrero <jmarrero@redhat.com>
-Date: Fri, 4 Aug 2023 08:27:39 -0400
-Subject: [PATCH] scripts: also ignore kernel-debug-modules.posttrans
-
---
- rust/src/scripts.rs | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/rust/src/scripts.rs b/rust/src/scripts.rs
-index 1f59e390..b8ab6623 100644
--- a/rust/src/scripts.rs
-+++ b/rust/src/scripts.rs
-@@ -21,8 +21,21 @@ static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! {
-     // XXX: we should probably change this to instead ignore based on the kernel virtual Provides
-     "kernel.posttrans",
-     "kernel-core.posttrans",
-+    "kernel-modules.posttrans",
-+    "kernel-redhat-core.posttrans",
-+    "kernel-redhat-modules.posttrans",
-     "kernel-debug-core.posttrans",
-+    "kernel-debug-modules.posttrans",
-+    "kernel-redhat-debug-core.posttrans",
-+    "kernel-redhat-debug-modules.posttrans",
-     "kernel-automotive-core.posttrans",
-+    "kernel-automotive-modules.posttrans",
-+    "kernel-automotive-debug-core.posttrans",
-+    "kernel-automotive-debug-modules.posttrans",
-+    "kernel-rt-core.posttrans",
-+    "kernel-rt-modules.posttrans",
-+    "kernel-rt-debug-core.posttrans",
-+    "kernel-rt-debug-modules.posttrans",
-     // Additionally ignore posttrans scripts for the Oracle Linux `kernel-uek` package
-     "kernel-uek.posttrans",
-     // Legacy workaround
-- 
-2.41.0
-
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@ -1,23 +1,27 @@
 # The canonical copy of this spec file is upstream at:
-# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in
+# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec

 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2022.10.117.g52714b51
+Version: 2026.1
 Release: 3%{?dist}
-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.  This is generated from the "rhel8" branch.
+# 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-override-Honor-install-in-container-case-too.patch
-Patch1: 0002-scripts-also-ignore-kernel-debug-modules.posttrans.patch
+Patch0: 0001-rpmostreed-transaction-types-fix-override-reset.patch

-ExclusiveArch: %{rust_arches}
+# See https://github.com/coreos/fedora-coreos-tracker/issues/1716
+# ostree not on i686 for RHEL 10
+# https://github.com/containers/composefs/pull/229#issuecomment-1838735764
+%if 0%{?fedora} || 0%{?rhel} >= 10
+ExcludeArch:    %{ix86}
+%endif

 BuildRequires: make
-%if 0%{?rhel} && !0%{?eln}
+%if 0%{?rhel}
 BuildRequires: rust-toolset
 %else
 BuildRequires: rust-packaging
@ -30,6 +34,14 @@ BuildRequires: rust
 # Embedded unit tests
 %bcond_with bin_unit_tests

+# Don't add the ostree-container binaries; this version
+# conditional needs to be kept in sync with the bootc one.
+%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
+    %bcond_with ostree_ext
+%else
+    %bcond_without ostree_ext
+%endif
+
 # This is copied from the libdnf spec
 %if 0%{?rhel} && ! 0%{?centos}
 %bcond_without rhsm
@ -37,19 +49,14 @@ BuildRequires: rust
 %bcond_with rhsm
 %endif

-# RHEL8 doesn't ship zchunk today.  See also the comments
-# in configure.ac around this as libdnf/librepo need to be in
-# sync, and today we bundle libdnf but not librepo.
-%if 0%{?rhel} && 0%{?rhel} <= 8
+# RHEL (8,9) doesn't ship zchunk today.  Keep this in sync
+# with libdnf: https://gitlab.com/redhat/centos-stream/rpms/libdnf/-/blob/762f631e36d1e42c63a794882269d26c156b68c1/libdnf.spec#L45
+%if 0%{?rhel}
 %bcond_with zchunk
 %else
 %bcond_without zchunk
 %endif

-%if 0%{?fedora} >= 34
-%define sqlite_rpmdb_default "--enable-sqlite-rpmdb-default"
-%endif
-
 # For the autofiles bits below
 BuildRequires: python3-devel
 # We always run autogen.sh
@ -57,11 +64,10 @@ BuildRequires: autoconf automake libtool git
 # For docs
 BuildRequires: chrpath
 BuildRequires: gtk-doc
-BuildRequires: gnome-common
 BuildRequires: /usr/bin/g-ir-scanner
 # Core requirements
 # One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members)
-BuildRequires: pkgconfig(ostree-1) >= 2020.7
+BuildRequires: pkgconfig(ostree-1) >= 2021.5
 BuildRequires: pkgconfig(polkit-gobject-1)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(rpm) >= 4.14.0
@ -69,6 +75,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)
@ -85,40 +93,55 @@ BuildRequires: pkgconfig(check)
 # but duplicating to be clear)
 BuildRequires: pkgconfig(libsolv)

-# We need g++ for libdnf
-BuildRequires: gcc-c++
+# These are build deps which aren't strictly required in Koji/Brew builds, but
+# are required for git builds. Since they're few and tiny, we just add it here
+# to keep it part of `dnf builddep`.
+BuildRequires: jq
+
+#########################################################################
+#                         libdnf build deps                             #
+#                                                                       #
+# Copy/pasted from libdnf/libdnf.spec. Removed the irrelevant bits like #
+# valgrind, rhsm, swig, python, and sanitizer stuff.                    #
+#########################################################################


-# more libdnf build deps (see libdnf's spec for versions; maintain ordering)
-%global libsolv_version 0.7.17
-%global libmodulemd_version 2.11.2-2
-%global librepo_version 1.13.0
-%global swig_version 3.0.12
-BuildRequires:  swig >= %{swig_version}
-BuildRequires:  pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
-BuildRequires:  pkgconfig(librepo) >= %{librepo_version}
+%global libsolv_version 0.7.21
+%global libmodulemd_version 2.13.0
+%global librepo_version 1.18.0
+
+BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  libsolv-devel >= %{libsolv_version}
-BuildRequires:  pkgconfig(json-c)
-BuildRequires:  pkgconfig(cppunit)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(smartcols)
-%if %{with zchunk}
-BuildRequires:  pkgconfig(zck) >= 0.9.11
-%endif
-BuildRequires:  gpgme-devel
-%if 0%{?rhel} <= 8
-# In current Fedora, this is a dependency of gpgme-devel, but
-# not in RHEL8.  Missing this package breaks -znow.
-BuildRequires:  libassuan-devel
-%endif
+BuildRequires:  pkgconfig(librepo) >= %{librepo_version}
+BuildRequires:  pkgconfig(check)
+BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.46.0
+BuildRequires:  pkgconfig(gtk-doc)
+BuildRequires:  rpm-devel >= 4.15.0
 %if %{with rhsm}
 BuildRequires:  pkgconfig(librhsm) >= 0.0.3
 %endif
+%if %{with zchunk}
+BuildRequires:  pkgconfig(zck) >= 0.9.11
+%endif
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(cppunit)
+BuildRequires:  pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
+BuildRequires:  pkgconfig(smartcols)
+BuildRequires:  gettext

-# Runtime libdnf deps
 Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
 Requires:       libsolv%{?_isa} >= %{libsolv_version}
 Requires:       librepo%{?_isa} >= %{librepo_version}
+%if 0%{?fedora} >= 43 || 0%{?rhel} >= 11
+Requires:       rpm-libs%{?_isa} >= 5.99.90
+%endif
+
+#########################################################################
+#                     end of libdnf build deps                          #
+#########################################################################

 # For now...see https://github.com/projectatomic/rpm-ostree/pull/637
 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17
@ -126,7 +149,24 @@ Requires:       librepo%{?_isa} >= %{librepo_version}
 # rpm-ostree wraps more of ostree (such as `ostree admin unlock` etc.)
 Requires: ostree
 Requires: bubblewrap
+# We have been building with fuse but changed to fuse3  on:
+# https://src.fedoraproject.org/rpms/rpm-ostree/c/3c602a23787fd2df873c0b18df3133c9fec4b66a
+# However our code is just calling fuse's fusermount.
+# We are updating our spec and code based on the discusion on:
+# https://github.com/coreos/rpm-ostree/pull/5047
+%if %{defined rhel} && 0%{?rhel} < 10
 Requires: fuse
+%else
+Requires: fuse3
+%endif
+
+# For container functionality
+# https://github.com/coreos/rpm-ostree/issues/3286
+Requires: skopeo
+Requires: bootc
+%if %{without ostree_ext}
+Requires: ostree-cli(ostree-container)
+%endif

 Requires: %{name}-libs%{?_isa} = %{version}-%{release}

@ -152,7 +192,10 @@ 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

 %build
 env NOCONFIGURE=1 ./autogen.sh
@ -166,9 +209,19 @@ 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
+# https://pagure.io/fedora-rust/rust-packaging/issue/33
+sed -i -e '/https:\/\//d' cargo-vendor.txt
+%endif

 %install
 %make_install INSTALL="install -p -c"
+%if %{without ostree_ext}
+rm -vrf $RPM_BUILD_ROOT/usr/libexec/libostree/ext
+%endif
 find $RPM_BUILD_ROOT -name '*.la' -delete

 # I try to do continuous delivery via rpmdistro-gitoverlay while
@ -204,10 +257,13 @@ $PYTHON autofiles.py > files \
  '%{_datadir}/dbus-1/system.d/*' \
  '%{_sysconfdir}/rpm-ostreed.conf' \
  '%{_prefix}/lib/systemd/system/*' \
+  '%{_prefix}/lib/kernel/install.d/*' \
  '%{_libexecdir}/rpm-ostree*' \
+%if %{with ostree_ext}
  '%{_libexecdir}/libostree/ext/*' \
+%endif
  '%{_datadir}/polkit-1/actions/*.policy' \
-  '%{_datadir}/dbus-1/system-services' \
+  '%{_datadir}/dbus-1/system-services/*' \
  '%{_datadir}/bash-completion/completions/*'

 $PYTHON autofiles.py > files.lib \
@ -222,133 +278,462 @@ $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 Oct 05 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-3
+* Thu Feb 05 2026 Joseph Marrero <jmarrero@fedoraproject.org> - 2026.1-3
+- Backport https://github.com/coreos/rpm-ostree/pull/5558
+  Resolves: RHEL-147222
+
+* Tue Jan 27 2026 Joseph Marrero <jmarrero@fedoraproject.org> - 2026.1-2
+- Revert conditional change for ostree_ext
+  Resolves: RHEL-144611
+
+* Thu Jan 22 2026 Joseph Marrero <jmarrero@fedoraproject.org> - 2026.1-1
+- Rebase to 2026.1
+  Resolves: RHEL-143217
+  Resolves: RHEL-143210
+
+* Wed Sep 10 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.11-1
+- Rebase to 2025.11
+  Resolves: #RHEL-113381
+
+* Thu Jul 31 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.10-1
+- Rebase to 2025.10
+  Resolves: #RHEL-106848
+
+* Fri Jul 11 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.9-1
+- Rebase to 2025.9
+  Resolves: #RHEL-103135
+
+* Wed Jun 04 2025 Colin Walters <walters@verbum.org> - 2025.8-3
+- Move `ostree container` to bootc
+  Resolves: #RHEL-72863
+
+* Thu May 08 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.8-1
+- Rebase to 2025.8
+  Resolves: #RHEL-90254
+
+* Tue Apr 01 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.7-2
+- Backport https://github.com/coreos/rpm-ostree/pull/5351
+  Resolves: #RHEL-85684
+
+* Fri Mar 28 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.7-1
+- Rebase to 2025.7
+  Resolves: #RHEL-85392
+
+* Fri Mar 21 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.6-4
+- Backport: https://github.com/coreos/rpm-ostree/pull/5322
+  Backport: https://github.com/coreos/rpm-ostree/pull/5339
+  Resolves: #RHEL-84466
+
+* Fri Mar 21 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.6-3
+- Backport https://github.com/coreos/rpm-ostree/pull/5341
+  Resolves: #RHEL-84466
+
+* Mon Mar 03 2025 Colin Walters <walters@verbum.org> - 2025.6-2
+- Update to 2025.6
+  Resolves: #RHEL-76015
+
+* Mon Feb 10 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.5-1
+- Rebase to 2025.5
+  Resolves: #RHEL-78697
+
+* Thu Jan 30 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.4-1
+- Rebase to 2025.4
+  Resolves: #RHEL-68131
+
+* Mon Jan 27 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.3-1
+- Rebase to 2025.3
+  Resolves: #RHEL-68131
+
+* Thu Jan 23 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.2-1
+- Rebase to 2025.2
+  Resolves: #RHEL-68131
+
+* Mon Jan 20 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.1-1
+- Rebase to 2025.1
+  Resolves: #RHEL-68131
+
+* Tue Nov 19 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.9-1
+- Rebase to 2024.9
+  Resolves: #RHEL-68131
+
+* Thu Oct 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-3
+- Backport https://github.com/coreos/rpm-ostree/pull/5051
+  Resolves: #RHEL-59716
+
+* Thu Aug 15 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-2
+- Backport https://github.com/coreos/rpm-ostree/pull/5051
+  Resolves: #RHEL-53871
+
+* Fri Aug 09 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-1
+- Rebase to 2024.7
+  Resolves: #RHEL-53871
+
+* Tue May 21 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.5-1
+- Rebase to 2024.6
+  Resolves: #RHEL-29339
+
+* Mon Apr 15 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.5-1
+- Rebase to 2024.5
+  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
+- Backport https://github.com/coreos/rpm-ostree/security/advisories/GHSA-2m76-cwhg-7wv6
+
+* Thu Mar 21 2024 Colin Walters <walters@verbum.org> - 2024.4-3
+- Backport patch to fix https://issues.redhat.com/browse/RHEL-29559
+
+* Fri Mar 15 2024 Colin Walters <walters@verbum.org> - 2024.4-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2024.4
+  Resolves: #RHEL-29339
+
+* Sun Feb 25 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.3-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2024.3
+  Backport https://github.com/coreos/rpm-ostree/commit/fe586621e5014d14f92b913338171a02ed29e6cc
+  Resolves: #RHEL-26186
+
+* Wed Jan 24 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.2-1
+- 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
+- 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
 - Use python macros and devel package
-  Resolves: #RHEL-2243
+  Resolves: #RHEL-11892

-* Mon Aug 07 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-2
- Backport fb97c48f3 & eae7e1d8
-  https://github.com/coreos/rpm-ostree/commit/fb97c48f3cd070c1ad559f3f43f86ad6548f6b02
-  https://github.com/coreos/rpm-ostree/commit/eae7e1d8d692b5ce6d3d6eef29abbd7512ae4682
-  Resolves: rhbz#2229804
+* Mon Oct 02 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

-* Sun Apr 30 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-1
- Sync to latest rhel8 branch
-  Resolves: rhbz#2192235
+* Sat Aug 26 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.7-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.7
+  Resolves: rhbz#2234352

-* Thu Feb 16 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-3
- Cherry pick
-  https://github.com/coreos/rpm-ostree/pull/4311/commits/a0f1275dfbd835b704355d095e610ac1f1254f25
-  Resolves: rhbz#2170579
+* 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

-* Tue Feb 14 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-2
- Sync to latest rhel8 branch
-  Resolves: rhbz#2169429
+* Fri Jul 21 2023 Colin Walters <walters@verbum.org> - 2023.5-2
+- Backport https://github.com/coreos/rpm-ostree/pull/4510
+  Related: rhbz#2224081

-* Fri Oct 14 2022 Colin Walters <walters@verbum.org> - 2022.10.99.g0049dbdd-3
- Resolves: rhbz#2134630
+* Thu Jun 22 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.5-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.5
+  Resolves: rhbz#2216811

-* Wed Sep 28 2022 Colin Walters <walters@verbum.org> - 2022.10.97.gade6df33-2
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
-  https://github.com/coreos/rpm-ostree/commit/ac182cb920f84946bb155e9cf061db7f5f26e917
- Resolves: rhbz#2122289
+* Tue Jun 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.4-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.4
+  Resolves: rhbz#2211486

-* Wed Aug 31 2022 Colin Walters <walters@verbum.org> - 2022.10.94.g89f58028-2
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
-  https://github.com/coreos/rpm-ostree/commit/89f58028f0bea5b6fa59bdb3506078e09957ec00
- Resolves: rhbz#2122289
- Resolves: rhbz#2122299
+* 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 Aug 16 2022 Colin Walters <walters@verbum.org> - 2022.10.90.g4abaf4b4-4
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
-  https://github.com/coreos/rpm-ostree/commit/4abaf4b4
-  Resolves: rhbz#2118774
+* 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 Jul 19 2022 Colin Walters <walters@verbum.org> - 2022.10.86.gd8f0c67a-3
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
-  https://github.com/coreos/rpm-ostree/commit/d8f0c67a0eba32281c9f2782a286e06486a4b909
-  Resolves: rhbz#2105414
+* Tue Dec 20 2022 Colin Walters <walters@verbum.org> - 2022.19-3
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.19
+  Resolves: rhbz#2153460

-* Wed Jun 15 2022 Colin Walters <walters@verbum.org> - 2022.2.8.gd50a74bd-2
- Update to latest rhel8 branch
-  https://github.com/coreos/rpm-ostree/pull/3749
-  https://github.com/coreos/rpm-ostree/pull/3751
-  Resolves: rhbz#2095528
+* Wed Dec 14 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
+- Rebase to 2022.16
+  Resolves: rhbz#2144586
+
+* 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
+- New upstream version
+  https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
+  Resolves: rhbz#2126108
+
+* 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
+- Backport https://github.com/coreos/rpm-ostree/pull/3721
+  Resolves: rhbz#2094085
+
+* Thu Apr 21 2022 Colin Walters <walters@verbum.org> - 2022.8-2
+- 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

 * Mon Feb 07 2022 Colin Walters <walters@verbum.org> - 2022.2-2
+- Rebase to 2022.2
+
+* Mon Jan 10 2022 Colin Walters <walters@verbum.org> - 2022.1-2
 - Rebase to 2022.1
+  Resolves: rhbz#2027476

-* Tue Jan 11 2022 Colin Walters <walters@verbum.org> - 2022.1-2
- Rebase to 2022.1
-  Resolves: rhbz#2032594
+* Wed Dec 01 2021 Colin Walters <walters@verbum.org> - 2021.14-3
+- Drop zchunk dependency
+  Resolves: rhbz#2028167

-* Wed Dec 15 2021 Colin Walters <walters@verbum.org> - 2021.14-3
- Rebase to 2021.14
-  Resolves: rhbz#2032594
+* Mon Nov 29 2021 Colin Walters <walters@verbum.org> - 2021.14-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.14
+  Resolves: rhbz#2027476

-* Fri Jun 18 2021 Luca BRUNO <lucab@redhat.com> - 2021.5-2
- Backport _dbpath fixes, see
-  https://github.com/coreos/rpm-ostree/issues/2904
-  Resolves: rhbz#1973579
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.6-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* 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
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* 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
  https://github.com/coreos/rpm-ostree/releases/tag/v2021.5
-  Resolves: rhbz#1959874

-* Tue Mar 30 2021 Colin Walters <walters@verbum.org> - 2020.7-4
- Backport https://github.com/coreos/rpm-ostree/pull/2386/commits/aa8e49aaeddfc5d38651fa08f46e059655818fd1
-  Resolves: #1944760
+* Sun May 09 2021 Jeff Law <jlaw@tachyum.com> - 2021.4-4
+- Re-enable LTO

-* Thu Nov 05 2020 Colin Walters <walters@verbum.org> - 2020.7-2
- Update to 2020.7
-  Resolves: #1894061
+* Wed Apr 28 2021 Colin Walters <walters@verbum.org> - 2021.4-3
+- Backport another patch for https://pagure.io/fedora-infrastructure/issue/9909
+
+* 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
+
+* Wed Mar 17 2021 Colin Walters <walters@verbum.org> - 2021.3-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.3
+
+* Wed Feb 17 2021 Colin Walters <walters@verbum.org> - 2021.2-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.2
+
+* Wed Feb 10 2021 Colin Walters <walters@verbum.org> - 2021.1-4
+- Backport patches from https://github.com/coreos/rpm-ostree/pull/2553
+
+* Tue Jan 26 2021 Jonathan Lebon <jonathan@jlebon.com> - 2021.1-3
+- Backport https://github.com/coreos/rpm-ostree/pull/2490 for rawhide
+
+* Tue Jan 19 15:08:59 UTC 2021 Colin Walters <walters@verbum.org> - 2021.1-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.1
+
+* Fri Dec 11 19:13:03 UTC 2020 Colin Walters <walters@verbum.org> - 2020.10-3
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.10
+
+* Fri Dec 11 13:42:33 UTC 2020 Colin Walters <walters@verbum.org> - 2020.9-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.9
+
+* Sat Nov 14 14:51:20 UTC 2020 Colin Walters <walters@verbum.org> - 2020.8-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.8
+
+* Mon Nov 02 2020 Luca BRUNO <lucab@lucabruno.net> - 2020.7-1
+- New upstream version
+  https://github.com/coreos/rpm-ostree/releases/tag/v2020.7
+
+* Mon Nov 02 2020 Jeff Law <law@redhat.com> - 2020.6-2
+- Fix invalid use of volatile caught by gcc-11
+
+* Fri Oct 30 16:48:43 UTC 2020 Colin Walters <walters@verbum.org> - 2020.6-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
+
+* Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.5-2
+- sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)
+
+* Tue Sep 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.5-1
+- New upstream version
+  https://github.com/coreos/rpm-ostree/releases/tag/v2020.5
+
+* Mon Aug 17 2020 Colin Walters <walters@verbum.org> - 2020.4.15.g8b0bcd7b-2
+- Update to latest upstream git for
+  https://bugzilla.redhat.com/show_bug.cgi?id=1865397
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.4-2
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

 * Wed Jul 29 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.4-1
 - New upstream version
  https://github.com/coreos/rpm-ostree/releases/tag/v2020.4
-  Resolves: #1861786
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2020.3-2
+- Disable LTO
+
+* Fri Jun 19 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-1
+- New upstream version
+  https://github.com/coreos/rpm-ostree/releases/tag/v2020.3
+
+* Fri May 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.2-3
+- Backport https://github.com/coreos/rpm-ostree/pull/2096
+  See https://github.com/coreos/fedora-coreos-tracker/issues/481

 * Fri May 15 2020 Colin Walters <walters@verbum.org> - 2020.2-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2020.2
-  Resolves: #1827712

-* Tue Mar 03 2020 Colin Walters <walters@verbum.org> - 2019.6-8
- Backport patches for initramfs /etc
-  Resolves: #1808459
+* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 2020.1.80.g3ec5e287-2
+- Rebuild (json-c)

-* Thu Feb 27 2020 Colin Walters <walters@verbum.org> - 2019.6-7
- Backport f295f543064f1a0b5833fefccd6bb203b3527623
-  Resolves: #1807487
+* Mon Apr 20 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.1.80.g3ec5e287-1
+- git master snapshot for using strict mode and lockfile-repos in FCOS:
+  https://github.com/coreos/rpm-ostree/pull/1858
+  https://github.com/coreos/rpm-ostree/pull/2058
+  https://github.com/coreos/fedora-coreos-tracker/issues/454

-* Thu Dec 05 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.6-6
- Backport dracut mknod patch for FIPS:
+* Fri Mar 13 2020 Colin Walters <walters@verbum.org> - 2020.1.21.ge9011530-2
+- Backport https://github.com/coreos/rpm-ostree/pull/2015
+  See https://github.com/coreos/fedora-coreos-tracker/issues/343
+
+* Thu Feb 27 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.1.21.ge9011530-1
+- git master snapshot for using base initramfs kargs in RHCOS:
+  https://github.com/coreos/rpm-ostree/pull/1998
+  https://github.com/coreos/rpm-ostree/pull/1997
+  https://bugzilla.redhat.com/show_bug.cgi?id=1806588
+
+* Wed Feb 05 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.1-1
+- New upstream version
+
+* Tue Feb 04 2020 Jonathan Lebon <jonathan@jlebon.com> - 2019.7.31.g70c38563-1
+- git master snapshot for Silverblue rawhide compose fixes
+  https://pagure.io/releng/failed-composes/issue/717
+  https://pagure.io/releng/failed-composes/issue/929
+  https://github.com/rpm-software-management/libdnf/pull/885
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 09 2020 Jonathan Lebon <jonathan@jlebon.com> - 2019.7-2
+- Backport patch for Silverblue composes:
+  https://pagure.io/releng/failed-composes/issue/717
+
+* Thu Dec 19 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.7-1
+- New upstream version
+
+* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 2019.6.24.gfec61ce5-2
+- Fix missing #includes for gcc-10
+
+* Thu Oct 31 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6.27.g3b8a1ec6-1
+- git master snapshot for dracut cpio cap_mknod fix:
  https://github.com/coreos/rpm-ostree/pull/1946

-* Thu Oct 31 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.6-5
- Backport HMAC patch for FIPS:
+* Thu Oct 31 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6.24.gfec61ce5-1
+- git master snapshot for HMAC path fix for FIPS:
  https://github.com/coreos/rpm-ostree/pull/1934

-* Fri Oct 18 2019 Colin Walters <walters@verbum.org> - 2019.6-4
- Backport zchunk patch
+* Wed Sep 25 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6-1
+- New upstream version

-* Tue Oct 15 2019 Colin Walters <walters@verbum.org> - 2019.6-3
- https://github.com/coreos/rpm-ostree/releases/tag/v20196
- Backport zstd patch
+* Thu Aug 22 2019 Colin Walters <walters@verbum.org> - 2019.5.7.gcac5aa41-3
+- New upstream git snapshot, mainly for backporting the arch-includes conditionals
+  to aid Fedora CoreOS on s390x.

-* Fri May 17 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.3-3
- Rebuild for rhel-8.1.0 branch
+* Wed Jul 31 2019 Stephen Gallagher <sgallagh@redhat.com> - 2019.5-2
+- Fix libmodulemd dependencies

-* Fri Mar 29 2019 Colin Walters <walters@verbum.org> - 2019.3-2
- Backport patch for pivot rebases
+* Thu Jul 25 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.5-1
+- New upstream version
+
+* Fri Jul 19 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.39.g8d90d03d-1
+- git master snapshot for --parent and lockfile overrides
+  https://github.com/projectatomic/rpm-ostree/pull/1871
+  https://github.com/projectatomic/rpm-ostree/pull/1867
+
+* Fri Jul 12 2019 Colin Walters <walters@verbum.org> - 2019.4.28.g44395673-3
+- Update rpmostree-rust.h in sources
+
+* Fri Jul 12 2019 Colin Walters <walters@verbum.org> - 2019.4.28.g44395673-2
+- Update with git snapshot for zstd support
+
+* Wed Jul 10 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.27.gb381e029-1
+- git master snapshot for add-commit-metadata
+  https://github.com/projectatomic/rpm-ostree/pull/1865/
+
+* Fri Jun 14 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.15.gbbc9aa9f-1
+- git master snapshot for OSTree layers
+  https://github.com/projectatomic/rpm-ostree/pull/1830/
+
+* Mon Jun 10 22:13:22 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2019.4.10.gc1cc0827-3
+- Rebuild for RPM 4.15
+
+* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2019.4.10.gc1cc0827-2
+- Rebuild for RPM 4.15
+
+* Thu Jun 06 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.10.gc1cc0827-1
+- git master snapshot for lockfile
+  https://github.com/projectatomic/rpm-ostree/pull/1745/
+
+* Tue May 28 2019 Dusty Mabe <dusty@dustymabe.com> - 2019.4-3
+- Add back in ppc64le and ppc64
+
+* Thu May 23 2019 Dusty Mabe <dusty@dustymabe.com> - 2019.4-2
+- Backport patch for db diff --format=json
+
+* Tue May 21 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4-1
+- New upstream version
+
+* Mon May 06 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3.5.g0da9f997-2
+- Add temporary hack to avoid UTF-8 for Bodhi
+  https://pagure.io/releng/issue/8330
+
+* Tue Apr 09 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3.5.g0da9f997-1
+- git master snapshot to test coreos-continuous tag

 * Wed Mar 27 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3-1
 - New upstream version
@ -377,9 +762,6 @@ $PYTHON autofiles.py > files.devel \
 * Sun Oct 28 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.9-1
 - New upstream version

-* Mon Oct 15 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.8-2
- Add new source and patch to drop cbindgen requirement
-
 * Tue Sep 11 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.8-1
 - New upstream version