From 1feff1be51a91fa4c2c1fe6ef1d4b9d12514d666 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 12 Apr 2021 16:23:35 -0400
Subject: [PATCH] https://github.com/coreos/rpm-ostree/releases/tag/v2021.4

---
 .gitignore      |  1 +
 rpm-ostree.spec | 41 ++++++++++++++++++++++++++---------------
 sources         |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 596cbba..f4e059b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@
 /rpm-ostree-2021.1.tar.xz
 /rpm-ostree-2021.2.tar.xz
 /rpm-ostree-2021.3.tar.xz
+/rpm-ostree-2021.4.tar.xz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 8d4f793..95e405c 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,8 +3,8 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2021.3
-Release: 2%{?dist}
+Version: 2021.4
+Release: 1%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
@@ -13,6 +13,7 @@ Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-
 
 ExclusiveArch: %{rust_arches}
 
+BuildRequires: make
 %if 0%{?rhel} && !0%{?eln}
 BuildRequires: rust-toolset
 %else
@@ -21,6 +22,9 @@ BuildRequires: cargo
 BuildRequires: rust
 %endif
 
+# Enable ASAN + UBSAN
+%bcond_with sanitizers
+
 # 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.
@@ -54,33 +58,34 @@ 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 2.5.0
 BuildRequires:  swig >= %{swig_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)
@@ -90,7 +95,10 @@ BuildRequires:  pkgconfig(zck) >= 0.9.11
 %endif
 BuildRequires:  gpgme-devel
 
+# 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
@@ -136,9 +144,9 @@ env NOCONFIGURE=1 ./autogen.sh
 # 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
-# FIXME: Disable this for now
-#export RUSTFLAGS="%{build_rustflags}"
-%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default}
+export RUSTFLAGS="%{build_rustflags}"
+%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} %{?with_sanitizers:--enable-sanitizers} 
+
 %make_build
 
 %install
@@ -202,6 +210,9 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* 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
 
diff --git a/sources b/sources
index 74bb414..309bf2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2021.3.tar.xz) = 15aad7d688a2a3809dc0d3c2754daa60ecfefc1c537602342c2a2ebc733f5bd14bf50179aa3d8f0980321362db76cc035f071c32a8a586c68c964baf751ab47b
+SHA512 (rpm-ostree-2021.4.tar.xz) = d6e79c46b3de7b7ea2107b50f6aa45c792e0d53328d080416f3aaee0454c168100d7ce988fbb201d7427d4e82b7fb51be08fd7fdceb09652825306d4965ee55b