https://github.com/coreos/rpm-ostree/releases/tag/v2022.8

Resolves: rhbz#2077062
  Resolves: rhbz#2023325

.gitignore

@@ -105,3 +105,4 @@
 /rpm-ostree-2022.1.tar.xz
 /rpm-ostree-2022.2.tar.xz
 /rpm-ostree-2022.7.tar.xz
+/rpm-ostree-2022.8.tar.xz

import-spec

@@ -22,7 +22,7 @@ done
 main() {
     local upstream
     upstream=$(get_parsed_spec_field URL)
-    curl -Lo rpm-ostree.spec.new "$upstream/raw/master/packaging/rpm-ostree.spec.in"
+    curl --fail-early -Lo rpm-ostree.spec.new "$upstream/raw/main/packaging/rpm-ostree.spec.in"
     sed -ne '/%changelog/,$ p' rpm-ostree.spec >> rpm-ostree.spec.new
 
     if [ -n "${KEEP_V_R}" ]; then

rpm-ostree.spec

@@ -3,7 +3,7 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2022.7
+Version: 2022.8
 Release: 2%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
@@ -24,6 +24,8 @@ BuildRequires: rust
 
 # Enable ASAN + UBSAN
 %bcond_with sanitizers
+# Embedded unit tests
+%bcond_with bin_unit_tests
 
 # 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
@@ -33,10 +35,6 @@ BuildRequires: rust
 %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
 # We always run autogen.sh
@@ -51,7 +49,7 @@ BuildRequires: /usr/bin/g-ir-scanner
 BuildRequires: pkgconfig(ostree-1) >= 2021.5
 BuildRequires: pkgconfig(polkit-gobject-1)
 BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(rpm) >= 4.16.0
+BuildRequires: pkgconfig(rpm) >= 4.14.0
 BuildRequires: pkgconfig(libarchive)
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: libcap-devel
@@ -72,33 +70,57 @@ BuildRequires: pkgconfig(check)
 # but duplicating to be clear)
 BuildRequires: pkgconfig(libsolv)
 
-# We need g++ for libdnf
+# These are build deps which aren't strictly required in Koji/Brew builds, but
-BuildRequires: gcc-c++
+# 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 libmodulemd_version 2.13.0
-%global librepo_version 1.13.0
+%global librepo_version 1.13.1
-%global swig_version 3.0.12
+
-BuildRequires:  swig >= %{swig_version}
+BuildRequires:  cmake
-BuildRequires:  pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
+BuildRequires:  gcc
-BuildRequires:  pkgconfig(librepo) >= %{librepo_version}
+BuildRequires:  gcc-c++
 BuildRequires:  libsolv-devel >= %{libsolv_version}
-BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(librepo) >= %{librepo_version}
-BuildRequires:  pkgconfig(cppunit)
+BuildRequires:  pkgconfig(check)
-BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.46.0
-BuildRequires:  pkgconfig(smartcols)
+BuildRequires:  pkgconfig(gtk-doc)
+BuildRequires:  rpm-devel >= 4.11.0
 %if %{with zchunk}
 BuildRequires:  pkgconfig(zck) >= 0.9.11
 %endif
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(cppunit)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
+BuildRequires:  pkgconfig(smartcols)
+BuildRequires:  gettext
 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
 
-# Runtime libdnf deps
 Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
 Requires:       libsolv%{?_isa} >= %{libsolv_version}
 Requires:       librepo%{?_isa} >= %{librepo_version}
 
+#########################################################################
+#                     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
 # etc.  We'll drop this dependency at some point in the future when
@@ -107,6 +129,10 @@ Requires: ostree
 Requires: bubblewrap
 Requires: fuse
 
+# For container functionality
+# https://github.com/coreos/rpm-ostree/issues/3286
+Recommends: skopeo
+
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -132,10 +158,8 @@ The %{name}-devel package includes the header files for %{name}-libs.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
-# We hit "LLVM ERROR: out of memory" with LTO on 32 bit 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1974927
 %if 0%{?__isa_bits} == 32
-sed -ie 's,^lto = true,# disabled: lto = true,' Cargo.toml
+sed -ie 's,^lto = true,lto = false,' Cargo.toml
 %endif
 
 %build
@@ -146,7 +170,7 @@ env NOCONFIGURE=1 ./autogen.sh
 %if 0%{?build_rustflags:1}
 export RUSTFLAGS="%{build_rustflags}"
 %endif
-%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} %{?with_sanitizers:--enable-sanitizers}
+%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers}  %{?with_bin_unit_tests:--enable-bin-unit-tests}
 
 %make_build
 
@@ -188,8 +212,9 @@ $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}/dbus-1/system-services/*' \
   '%{_datadir}/bash-completion/completions/*'
 
 $PYTHON autofiles.py > files.lib \
@@ -210,8 +235,12 @@ $PYTHON autofiles.py > files.devel \
 %files libs -f files.lib
 
 %files devel -f files.devel
-
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (rpm-ostree-2022.7.tar.xz) = 56a98aa6cb9979b0f74530b3c24e6b3fdefbbc7cd6a7923c0787031bcc9ec13e435931fdb62a9e21ff6e865167e1b40ae9eeaa1b3eb9e037b476ca658045f029
+SHA512 (rpm-ostree-2022.8.tar.xz) = c2c79430bd9f09c93d7e78ba3243f76ee31baac318fc3cc7a21ccb419dc9967406ea317eedb51c5df4202c47a5f6047999b6287d63d0ba8b0d797162030af3bb