From 577512d0e1e5fba33992b042c46bcbf6fc51d747 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 19 Jan 2021 17:00:50 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rpm-ostree.git#2a00094320d798832e208acec19e391370ce2377
---
 .gitignore      |  1 +
 rpm-ostree.spec | 23 +++++++++++++++++------
 sources         |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index d3d9312..494dc93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,4 @@
 /rpm-ostree-2020.8.tar.xz
 /rpm-ostree-2020.9.tar.xz
 /rpm-ostree-2020.10.tar.xz
+/rpm-ostree-2021.1.tar.xz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 6b21747..e07641f 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,12 +3,12 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2020.10
-Release: 1%{?dist}
+Version: 2021.1
+Release: 2%{?dist}
 License: LGPLv2+
 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.  If rust is enabled, it contains vendored sources.
+# 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
 
 ExclusiveArch: %{rust_arches}
@@ -16,6 +16,7 @@ ExclusiveArch: %{rust_arches}
 %if 0%{?rhel} && !0%{?eln}
 BuildRequires: rust-toolset
 %else
+BuildRequires: rust-packaging
 BuildRequires: cargo
 BuildRequires: rust
 %endif
@@ -29,6 +30,10 @@ 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
@@ -36,12 +41,11 @@ 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)
@@ -129,7 +133,11 @@ The %{name}-devel package includes the header files for %{name}-libs.
 %define _lto_cflags %{nil}
 
 env NOCONFIGURE=1 ./autogen.sh
-%configure --disable-silent-rules --enable-gtk-doc
+# 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
+export RUSTFLAGS="%{build_rustflags}"
+%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default}
 %make_build
 
 %install
@@ -193,6 +201,9 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* 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
 
diff --git a/sources b/sources
index 27337a2..6f2eef4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2020.10.tar.xz) = b64637d99a9d7d17538e9a9bb1aac11a39447da3a32c8ce0d3a3ad2ea4d424b6757d6169924f0b9ec4639fd781baf7681cbce72c2860a9d18254e07751056a65
+SHA512 (rpm-ostree-2021.1.tar.xz) = e92d5feaea8a524953ffa105725450a4546dd93b94ce57d3f7cdd26d4be39ab2063e07891c025aff1e7dc04aa9198f298c19e6084e7b050293af9799887ba0be