.gitignore

@@ -1 +1 @@
-SOURCES/rpm-ostree-2019.6.tar.xz
+SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz

.rpm-ostree.metadata

@@ -1 +1 @@
-4394f32b43403577dd738675cbf8e28efbf8866f SOURCES/rpm-ostree-2019.6.tar.xz
+43d5b34cf6b8c77fc2f17429dcc1d385c885b032 SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz

SOURCES/0001-app-status-Fix-printf-format-string-for-32-bit.patch

@@ -1,35 +0,0 @@
-From 08c98eda94381f0147af5783960121574043fa5a Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Wed, 25 Sep 2019 12:42:59 -0400
-Subject: [PATCH] app/status: Fix printf format string for 32-bit
-
-Hit this when compiling in Koji.
----
- src/app/rpmostree-builtin-status.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/app/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
-index 2bc2c4b5..8b38fc83 100644
---- a/src/app/rpmostree-builtin-status.c
-+++ b/src/app/rpmostree-builtin-status.c
-@@ -1119,7 +1119,7 @@ fetch_history_deployment_gvariant (RORHistoryEntry  *entry,
-                                    GError          **error)
- {
-   g_autofree char *fn =
--    g_strdup_printf ("%s/%lu", RPMOSTREE_HISTORY_DIR, entry->deploy_timestamp);
-+    g_strdup_printf ("%s/%" PRIu64, RPMOSTREE_HISTORY_DIR, entry->deploy_timestamp);
- 
-   *out_deployment = NULL;
- 
-@@ -1165,7 +1165,7 @@ print_history_entry (RORHistoryEntry  *entry,
-       print_timestamp_and_relative ("BootTimestamp", entry->last_boot_timestamp);
-       if (entry->boot_count > 1)
-         {
--          g_print ("%s BootCount: %lu; first booted on ",
-+          g_print ("%s BootCount: %" PRIu64 "; first booted on ",
-                    libsd_special_glyph (TREE_RIGHT), entry->boot_count);
-           print_timestamp_and_relative (NULL, entry->first_boot_timestamp);
-         }
--- 
-2.21.0
-

SOURCES/0001-libpriv-kernel-Use-g_build_filename-instead-of-g_str.patch

@@ -1,47 +0,0 @@
-From 6aa496e3128321f911dae10bf1a0f32c5e9a11fd Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 29 Oct 2019 16:38:56 -0400
-Subject: [PATCH 1/2] libpriv/kernel: Use g_build_filename instead of
- g_strconcat
-
-It's much easier to mess up with the latter than the former when
-building filenames. There's a bunch more all over the codebase; just did
-this bit to be consistent with the next commit which also uses it.
----
- src/libpriv/rpmostree-kernel.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libpriv/rpmostree-kernel.c b/src/libpriv/rpmostree-kernel.c
-index 9eb052bd..2266f9c7 100644
---- a/src/libpriv/rpmostree-kernel.c
-+++ b/src/libpriv/rpmostree-kernel.c
-@@ -353,7 +353,7 @@ rpmostree_finalize_kernel (int rootfs_dfd,
-                            GError **error)
- {
-   const char slash_bootdir[] = "boot";
--  g_autofree char *modules_bootdir = g_strconcat ("usr/lib/modules/", kver, NULL);
-+  g_autofree char *modules_bootdir = g_build_filename ("usr/lib/modules", kver, NULL);
- 
-   /* Calculate the sha256sum of the kernel+initramfs (called the "boot
-    * checksum"). We checksum the initramfs from the tmpfile fd (via mmap()) to
-@@ -371,7 +371,7 @@ rpmostree_finalize_kernel (int rootfs_dfd,
-   }
-   const char *boot_checksum_str = g_checksum_get_string (boot_checksum);
- 
--  g_autofree char *kernel_modules_path = g_strconcat (modules_bootdir, "/vmlinuz", NULL);;
-+  g_autofree char *kernel_modules_path = g_build_filename (modules_bootdir, "vmlinuz", NULL);
-   /* It's possible the bootdir is already the modules directory; in that case,
-    * we don't need to rename.
-    */
-@@ -394,7 +394,7 @@ rpmostree_finalize_kernel (int rootfs_dfd,
-     }
- 
-   /* Replace the initramfs */
--  g_autofree char *initramfs_modules_path = g_strconcat (modules_bootdir, "/initramfs.img", NULL);
-+  g_autofree char *initramfs_modules_path = g_build_filename (modules_bootdir, "initramfs.img", NULL);
-   if (unlinkat (rootfs_dfd, initramfs_modules_path, 0) < 0)
-     {
-       if (errno != ENOENT)
--- 
-2.21.0
-

SOURCES/0001-libpriv-kernel-add-cap_mknod-to-dracut-run.patch

@@ -1,43 +0,0 @@
-From 3b8a1ec6c400a4e5af0f7f5889b360d2ed16f572 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 3 Dec 2019 21:36:40 -0500
-Subject: [PATCH] libpriv/kernel: add cap_mknod to dracut run
-
-A lot of history with this. But essentially, dracut tries to `mknod` a
-few character devices like `/dev/random` and `/dev/urandom` and fails.
-
-We originally blocked `cap_mknod` because, well, `%post` scripts don't
-really need to do that, and it would get wiped anyway. But there is a
-use case for dracut's CPIO: we want `/dev/*random` to be available in
-early boot *before* systemd even mounts `devtmpfs` because libgcrypt as
-part of its constructor-time selftests in FIPS mode wants to read from
-there.
-
-For more fun, see:
-https://bugzilla.redhat.com/show_bug.cgi?id=1778940
-https://bugzilla.redhat.com/show_bug.cgi?id=1401444
-https://bugzilla.redhat.com/show_bug.cgi?id=1380866
----
- src/libpriv/rpmostree-kernel.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/libpriv/rpmostree-kernel.c b/src/libpriv/rpmostree-kernel.c
-index 2bea504c..a7fffcb6 100644
---- a/src/libpriv/rpmostree-kernel.c
-+++ b/src/libpriv/rpmostree-kernel.c
-@@ -564,6 +564,12 @@ rpmostree_run_dracut (int     rootfs_dfd,
-       rpmostree_bwrap_bind_read (bwrap, "usr", "/usr");
-     }
- 
-+  /* Need to let dracut create devices like /dev/urandom:
-+   * https://bugzilla.redhat.com/show_bug.cgi?id=1778940
-+   * https://bugzilla.redhat.com/show_bug.cgi?id=1401444
-+   * https://bugzilla.redhat.com/show_bug.cgi?id=1380866 */
-+  rpmostree_bwrap_append_bwrap_argv (bwrap, "--cap-add", "cap_mknod", NULL);
-+
-   if (dracut_host_tmpdir)
-     rpmostree_bwrap_bind_readwrite (bwrap, dracut_host_tmpdir->path, "/tmp/dracut");
- 
--- 
-2.23.0
-

SOURCES/0001-override-Honor-install-in-container-case-too.patch

@@ -0,0 +1,48 @@
+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
+

SOURCES/0001-unpacker-Build-with-older-libarchive-without-zstd.patch

@@ -1,43 +0,0 @@
-From 11ee20c1cdcc7a76d9e1047e8063b8349a6c6da6 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 15 Oct 2019 15:16:06 +0000
-Subject: [PATCH] unpacker: Build with older libarchive without zstd
-
-It's not in RHEL8.1, and I'm trying to rebase rpm-ostree.
----
- configure.ac                          | 4 ++++
- src/libpriv/rpmostree-unpacker-core.c | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 873dc6b9..a0c5cce4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,6 +122,10 @@ dnl bundled libdnf
- PKGDEP_RPMOSTREE_CFLAGS="-I $(pwd)/libdnf -I $(pwd)/libdnf-build $PKGDEP_RPMOSTREE_CFLAGS"
- PKGDEP_RPMOSTREE_LIBS="-L$(pwd)/libdnf-build/libdnf -ldnf $PKGDEP_RPMOSTREE_LIBS"
- 
-+dnl RHEL8.1 has old libarchive
-+AS_IF([pkg-config --atleast-version=3.3.3 libarchive],
-+  [AC_DEFINE([HAVE_LIBARCHIVE_ZSTD], 1, [Define if we have libarchive with zstd])])
-+
- dnl This is the current version in Fedora 25.
- AS_IF([pkg-config --atleast-version=4.14.2 rpm], [], [AC_MSG_ERROR([librpm 4.14.2 required])])
- 
-diff --git a/src/libpriv/rpmostree-unpacker-core.c b/src/libpriv/rpmostree-unpacker-core.c
-index 3bd574a4..2d741b1e 100644
---- a/src/libpriv/rpmostree-unpacker-core.c
-+++ b/src/libpriv/rpmostree-unpacker-core.c
-@@ -74,7 +74,9 @@ rpmostree_unpack_rpm2cpio (int fd, GError **error)
-         archive_read_support_filter_gzip,
-         archive_read_support_filter_xz,
-         archive_read_support_filter_bzip2,
-+#ifdef HAVE_LIBARCHIVE_ZSTD
-         archive_read_support_filter_zstd,
-+#endif
-         archive_read_support_format_cpio };
- 
-     for (i = 0; i < G_N_ELEMENTS (archive_setup_funcs); i++)
--- 
-2.21.0
-

SOURCES/0002-libpriv-kernel-Hack-around-vmlinuz-path-in-HMAC-file.patch

@@ -1,66 +0,0 @@
-From fec61ce5778910bac7779191ee8deeb0a24593c8 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 29 Oct 2019 16:40:39 -0400
-Subject: [PATCH 2/2] libpriv/kernel: Hack around vmlinuz path in HMAC file
-
-As mentioned in the comment block:
-
-```
-If there's an HMAC file, fix the path to the kernel in it to be
-relative. Right now, the kernel spec encodes `/boot/vmlinux-$kver`,
-which of course not going to work for us. We should work towards making
-this change directly into the kernel spec.
-```
-
-For background, see this comment and following:
-https://github.com/ostreedev/ostree/pull/1962#issuecomment-547488164
----
- src/libpriv/rpmostree-kernel.c | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/src/libpriv/rpmostree-kernel.c b/src/libpriv/rpmostree-kernel.c
-index 2266f9c7..2bea504c 100644
---- a/src/libpriv/rpmostree-kernel.c
-+++ b/src/libpriv/rpmostree-kernel.c
-@@ -393,6 +393,38 @@ rpmostree_finalize_kernel (int rootfs_dfd,
-         return glnx_throw_errno_prefix (error, "linkat(%s)", kernel_modules_path);
-     }
- 
-+  /* If there's an HMAC file, fix the path to the kernel in it to be relative. Right now,
-+   * the kernel spec encodes `/boot/vmlinux-$kver`, which of course not going to work for
-+   * us. We should work towards making this change directly into the kernel spec. */
-+  g_autofree char *hmac_path = g_build_filename (modules_bootdir, ".vmlinuz.hmac", NULL);
-+  if (!glnx_fstatat_allow_noent (rootfs_dfd, hmac_path, NULL, 0, error))
-+    return FALSE;
-+  if (errno == 0)
-+    {
-+      g_autofree char *contents = glnx_file_get_contents_utf8_at (rootfs_dfd, hmac_path,
-+                                                                  NULL, cancellable, error);
-+      if (contents == NULL)
-+        return FALSE;
-+
-+      /* rather than trying to parse and understand the *sum format, just hackily replace */
-+      g_autofree char *old_path = g_strconcat ("  /boot/vmlinuz-", kver, NULL);
-+      g_autofree char *new_path = g_strconcat ("  vmlinuz-", kver, NULL);
-+      g_autofree char *new_contents =
-+        rpmostree_str_replace (contents, old_path, new_path, error);
-+      if (!new_contents)
-+        return FALSE;
-+
-+      /* sanity check there are no '/' in there; that way too we just error out if the path
-+       * or format changes (but really, this should be a temporary hack...) */
-+      if (strchr (new_contents, '/') != 0)
-+        return glnx_throw (error, "Unexpected / in .vmlinuz.hmac: %s", new_contents);
-+
-+      if (!glnx_file_replace_contents_at (rootfs_dfd, hmac_path,
-+                                          (guint8*)new_contents, -1, 0,
-+                                          cancellable, error))
-+        return FALSE;
-+    }
-+
-   /* Replace the initramfs */
-   g_autofree char *initramfs_modules_path = g_build_filename (modules_bootdir, "initramfs.img", NULL);
-   if (unlinkat (rootfs_dfd, initramfs_modules_path, 0) < 0)
--- 
-2.21.0
-

SOURCES/0002-scripts-also-ignore-kernel-debug-modules.posttrans.patch

@@ -0,0 +1,38 @@
+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
+

SPECS/rpm-ostree.spec

@@ -1,93 +1,124 @@
 # The canonical copy of this spec file is upstream at:
-# https://github.com/projectatomic/rpm-ostree/blob/master/packaging/rpm-ostree.spec.in
+# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2019.6
-Release: 6%{?dist}
-#VCS: https://github.com/cgwalters/rpm-ostree
-# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
-# in the upstream git.  If rust is enabled, it contains vendored sources.
-Source0: rpm-ostree-%{version}.tar.xz
+Version: 2022.10.117.g52714b51
+Release: 3%{?dist}
 License: LGPLv2+
-URL: https://github.com/projectatomic/rpm-ostree
+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.
+Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
 
-Patch0: 0001-app-status-Fix-printf-format-string-for-32-bit.patch
-Patch1: 0001-unpacker-Build-with-older-libarchive-without-zstd.patch
-Patch2: 0001-libpriv-kernel-Use-g_build_filename-instead-of-g_str.patch
-Patch3: 0002-libpriv-kernel-Hack-around-vmlinuz-path-in-HMAC-file.patch
-Patch4: 0001-libpriv-kernel-add-cap_mknod-to-dracut-run.patch
-
-%if !%{defined rust_arches}
-# It's not defined yet in the base CentOS7 root
-%define rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
-%endif # defined rust_arches
+Patch0: 0001-override-Honor-install-in-container-case-too.patch
+Patch1: 0002-scripts-also-ignore-kernel-debug-modules.posttrans.patch
 
 ExclusiveArch: %{rust_arches}
 
-%if 0%{?fedora}
+BuildRequires: make
+%if 0%{?rhel} && !0%{?eln}
+BuildRequires: rust-toolset
+%else
+BuildRequires: rust-packaging
 BuildRequires: cargo
 BuildRequires: rust
+%endif
+
+# Enable ASAN + UBSAN
+%bcond_with sanitizers
+# Embedded unit tests
+%bcond_with bin_unit_tests
+
+# This is copied from the libdnf spec
+%if 0%{?rhel} && ! 0%{?centos}
+%bcond_without rhsm
 %else
-# assume el8
-BuildRequires: rust-toolset
+%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
+%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: /usr/bin/python3
+BuildRequires: python3-devel
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool git
 # For docs
 BuildRequires: chrpath
 BuildRequires: gtk-doc
-BuildRequires: gperf
 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) >= 2019.2
+BuildRequires: pkgconfig(ostree-1) >= 2020.7
 BuildRequires: pkgconfig(polkit-gobject-1)
 BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(rpm)
+BuildRequires: pkgconfig(rpm) >= 4.14.0
 BuildRequires: pkgconfig(libarchive)
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: libcap-devel
 BuildRequires: libattr-devel
 
-# We currently interact directly with librepo
+# We currently interact directly with librepo (libdnf below also pulls it in,
+# but duplicating to be clear)
 BuildRequires: pkgconfig(librepo)
 
 # Needed by curl-rust
 BuildRequires: pkgconfig(libcurl)
 
-# libdnf bundling
-# We're using RPATH to pick up our bundled version
-%global __requires_exclude ^libdnf[.]so[.].*$
-
-# Our bundled libdnf.so.2 is for us only
-%global __provides_exclude_from ^%{_libdir}/%{name}/.*$
-
 BuildRequires: cmake
 BuildRequires: pkgconfig(expat)
 BuildRequires: pkgconfig(check)
+
+# We use some libsolv types directly too (libdnf below also pulls it in,
+# but duplicating to be clear)
 BuildRequires: pkgconfig(libsolv)
 
 # We need g++ for libdnf
 BuildRequires: gcc-c++
 
 
-# more libdnf build deps (see libdnf's spec for versions)
+# 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
-%global libmodulemd_version 1.6.1
 BuildRequires:  swig >= %{swig_version}
-BuildRequires:  pkgconfig(modulemd) >= %{libmodulemd_version}
+BuildRequires:  pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
+BuildRequires:  pkgconfig(librepo) >= %{librepo_version}
+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
+%if %{with rhsm}
+BuildRequires:  pkgconfig(librhsm) >= 0.0.3
+%endif
 
-Requires:       libmodulemd1%{?_isa} >= %{libmodulemd_version}
+# Runtime libdnf deps
+Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
+Requires:       libsolv%{?_isa} >= %{libsolv_version}
+Requires:       librepo%{?_isa} >= %{librepo_version}
 
 # For now...see https://github.com/projectatomic/rpm-ostree/pull/637
 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17
@@ -125,11 +156,19 @@ The %{name}-devel package includes the header files for %{name}-libs.
 
 %build
 env NOCONFIGURE=1 ./autogen.sh
-%configure --disable-silent-rules --enable-gtk-doc
-make %{?_smp_mflags}
+# Since we're hybrid C++/Rust we need to propagate this manually;
+# the %%configure macro today assumes (reasonably) that one is building
+# C/C++ and sets C{,XX}FLAGS
+%if 0%{?build_rustflags:1}
+export RUSTFLAGS="%{build_rustflags}"
+%endif
+%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers}  %{?with_bin_unit_tests:--enable-bin-unit-tests} \
+  %{?with_rhsm:--enable-featuresrs=rhsm}
+
+%make_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
+%make_install INSTALL="install -p -c"
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
 # I try to do continuous delivery via rpmdistro-gitoverlay while
@@ -154,8 +193,8 @@ for line in sys.argv[1:]:
         else:
             sys.stderr.write('{0} did not match any files\n'.format(line))
 EOF
-PYTHON=python3
-if ! test -x /usr/bin/python3; then
+PYTHON='%{python3}'
+if ! test -x '%{python3}'; then
     PYTHON=python2
 fi
 $PYTHON autofiles.py > files \
@@ -166,6 +205,7 @@ $PYTHON autofiles.py > files \
   '%{_sysconfdir}/rpm-ostreed.conf' \
   '%{_prefix}/lib/systemd/system/*' \
   '%{_libexecdir}/rpm-ostree*' \
+  '%{_libexecdir}/libostree/ext/*' \
   '%{_datadir}/polkit-1/actions/*.policy' \
   '%{_datadir}/dbus-1/system-services' \
   '%{_datadir}/bash-completion/completions/*'
@@ -190,6 +230,105 @@ $PYTHON autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Thu Oct 05 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-3
+- Use python macros and devel package
+  Resolves: #RHEL-2243
+
+* 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
+
+* Sun Apr 30 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-1
+- Sync to latest rhel8 branch
+  Resolves: rhbz#2192235
+
+* 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
+
+* Tue Feb 14 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-2
+- Sync to latest rhel8 branch
+  Resolves: rhbz#2169429
+
+* Fri Oct 14 2022 Colin Walters <walters@verbum.org> - 2022.10.99.g0049dbdd-3
+- Resolves: rhbz#2134630
+
+* 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
+
+* 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
+
+* 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 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
+
+* 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
+
+* Mon Feb 07 2022 Colin Walters <walters@verbum.org> - 2022.2-2
+- Rebase to 2022.1
+
+* Tue Jan 11 2022 Colin Walters <walters@verbum.org> - 2022.1-2
+- Rebase to 2022.1
+  Resolves: rhbz#2032594
+
+* Wed Dec 15 2021 Colin Walters <walters@verbum.org> - 2021.14-3
+- Rebase to 2021.14
+  Resolves: rhbz#2032594
+
+* 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
+
+* 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
+
+* Thu Nov 05 2020 Colin Walters <walters@verbum.org> - 2020.7-2
+- Update to 2020.7
+  Resolves: #1894061
+
+* 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
+
+* 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
+
+* Thu Feb 27 2020 Colin Walters <walters@verbum.org> - 2019.6-7
+- Backport f295f543064f1a0b5833fefccd6bb203b3527623
+  Resolves: #1807487
+
 * Thu Dec 05 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.6-6
 - Backport dracut mknod patch for FIPS:
   https://github.com/coreos/rpm-ostree/pull/1946