From b11c2bbf6cdddf2e35635dd83cd2defb8661b836 Mon Sep 17 00:00:00 2001
From: Joseph Marrero <jmarrero@redhat.com>
Date: Fri, 25 Aug 2023 17:01:54 -0400
Subject: [PATCH] Release 2023.6

---
 .gitignore      |  1 +
 rpm-ostree.spec | 19 ++++++-------------
 sources         |  3 +--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 437d144..76db44e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,4 @@
 /rpm-ostree-2023.4.tar.xz
 /rpm-ostree-2023.5.tar.xz
 /ostree-ext.vendor.tar.gz
+/rpm-ostree-2023.6.tar.xz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index a689efb..226c050 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,23 +3,13 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-# NOTE WHEN BUMPING RELEASE, REMOVE SOURCE1 BELOW
-Version: 2023.5
-Release: 2%{?dist}
+Version: 2023.6
+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"
 # 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
-# Updated vendor bits for the below patch; REMOVE THIS when updating
-Source1: ostree-ext.vendor.tar.gz
-
-# Backport https://github.com/coreos/rpm-ostree/pull/4510
-# which is really just a backport of:
-#  - https://github.com/ostreedev/ostree-rs-ext/pull/504/commits/abc8ed660843b3ad85e72c0002996dabd61778dd
-#  - https://github.com/ostreedev/ostree-rs-ext/pull/505/commits/389a6184883136752a7ff08013b70c929b4df9db
-# BUT see also above Source1
-Patch0: 0001-main-Update-ostree-ext-add-provisional-repair-entryp.patch
 
 ExclusiveArch: %{rust_arches}
 
@@ -167,7 +157,6 @@ The %{name}-devel package includes the header files for %{name}-libs.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
-tar xvf %{SOURCE1}
 %if 0%{?__isa_bits} == 32
 sed -ie 's,^lto = true,lto = false,' Cargo.toml
 %endif
@@ -248,6 +237,10 @@ $PYTHON autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Fri Aug 25 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.6-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.6
+  Resolves: rhbz#2234352
+
 * Fri Jul 21 2023 Colin Walters <walters@verbum.org> - 2023.5-2
 - Backport https://github.com/coreos/rpm-ostree/pull/4510
   Related: rhbz#2224081
diff --git a/sources b/sources
index a1521bf..5626c61 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (rpm-ostree-2023.5.tar.xz) = 3b37fad7ab51b2371fb982b74559f9d5dd5dd09891bd779d828f93ab1f319374445b333c70cf7057605594a296d366aae5b4bf5bbb2081c49d463e7b76ced723
-SHA512 (ostree-ext.vendor.tar.gz) = 690fb58edb02fb7268b27d3e18be3174ba13660b0f3a025ce381b1aeb661389f25d5d30050b89b063266aa7c1c8b0589d763dff2162fabdb87d4ebaee2c066df
+SHA512 (rpm-ostree-2023.6.tar.xz) = 2735101f55de965160385011a180bcfee8dad4997f5707cc6bb4a2b3612f945beeecb57ecec96846a01d5f6a7b7b0c5ee31d99998eb51fb63484c712b4c7a988