Release 2020.3

.gitignore

@@ -87,3 +87,4 @@
 /rpm-ostree-2020.1.21.ge9011530.tar.xz
 /rpm-ostree-2020.1.80.g3ec5e287.tar.xz
 /rpm-ostree-2020.2.tar.xz
+/rpm-ostree-2020.3.tar.xz

0001-upgrader-Reset-ref-before-fetching-commit-by-overrid.patch

@@ -1,49 +0,0 @@
-From b7ff1612eae3e5aa88fc52d59f7511c7046152fb Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Fri, 15 May 2020 10:19:04 -0400
-Subject: [PATCH] upgrader: Reset ref before fetching commit by override
-
-This is a short-term hack until we can depend on the new
-`timestamp-check-from-rev` from ostree:
-
-https://github.com/ostreedev/ostree/pull/2099
-
-That way, we still get downgrade protection, but wrt the checked out
-deployment, not the local ref.
-
-For more information, see
-https://github.com/coreos/rpm-ostree/pull/2094
-https://github.com/coreos/fedora-coreos-tracker/issues/481
----
- src/daemon/rpmostree-sysroot-upgrader.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c
-index 4e595b1b..45aaf282 100644
---- a/src/daemon/rpmostree-sysroot-upgrader.c
-+++ b/src/daemon/rpmostree-sysroot-upgrader.c
-@@ -419,8 +419,19 @@ rpmostree_sysroot_upgrader_pull_base (RpmOstreeSysrootUpgrader  *self,
-             /* Add the timestamp check, unless disabled. The option was added in
-              * libostree v2017.11 */
-             if (!allow_older)
--              g_variant_builder_add (optbuilder, "{s@v}", "timestamp-check",
--                                     g_variant_new_variant (g_variant_new_boolean (TRUE)));
-+              {
-+                g_variant_builder_add (optbuilder, "{s@v}", "timestamp-check",
-+                                       g_variant_new_variant (g_variant_new_boolean (TRUE)));
-+                /* XXX: Short-term hack until we switch to timestamp-check-from-rev:
-+                 * https://github.com/coreos/rpm-ostree/pull/2094. This ensures that
-+                 * timestamp-check is comparing against our deployment csum's timestamp, not
-+                 * whatever the ref is pointing to.
-+                 */
-+                if (override_commit &&
-+                    !ostree_repo_set_ref_immediate (self->repo, origin_remote, origin_ref,
-+                                                    self->base_revision, cancellable, error))
-+                  return FALSE;
-+              }
-             g_variant_builder_add (optbuilder, "{s@v}", "refs",
-                                    g_variant_new_variant (g_variant_new_strv (
-                                                                               (const char *const *)&origin_ref, 1)));
--- 
-2.25.4
-

rpm-ostree.spec

@@ -3,8 +3,8 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2020.2
+Version: 2020.3
-Release: 3%{?dist}
+Release: 1%{?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.
@@ -12,8 +12,6 @@ Source0: rpm-ostree-%{version}.tar.xz
 License: LGPLv2+
 URL: https://github.com/projectatomic/rpm-ostree
 
-Patch0: 0001-upgrader-Reset-ref-before-fetching-commit-by-overrid.patch
-
 ExclusiveArch: %{rust_arches}
 
 %if 0%{?rhel} && !0%{?eln}
@@ -191,6 +189,10 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* Wed Feb 05 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

sources

@@ -1 +1 @@
-SHA512 (rpm-ostree-2020.2.tar.xz) = ec6fbdced379c7053f6d466fe7e863e2320105c832c2dc5349b7233e0129f4777f12bc0d973e4592cf46d977ddd6d92733d5b28f1df06ae1dc0ca9773eb9d62f
+SHA512 (rpm-ostree-2020.3.tar.xz) = 2f15d8ca932acb8586d58ea6eaaead13d409b899329e55f95a40c03a712e6c8dc2cbed59c3e303a904e130a6ac38f592a0d3c951eac5e598b055d3576d310c11