From 013c7e3b63c35586c19851ea1b625d9896678e9c Mon Sep 17 00:00:00 2001
From: Joseph Marrero Corchado <jmarrero@redhat.com>
Date: Thu, 23 Jan 2025 21:21:03 -0500
Subject: [PATCH] Rebase to rpm-ostree 2025.2

Resolves: #RHEL-68130
---
 .gitignore      |  1 +
 rpm-ostree.spec | 28 +++++++++++++++++-----------
 sources         |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b7adff..f48646c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,4 @@
 /rpm-ostree-2024.8.tar.xz
 /rpm-ostree-2024.9.tar.xz
 /rpm-ostree-2025.1.tar.xz
+/rpm-ostree-2025.2.tar.xz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index c277cbe..4f6d2ae 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -1,9 +1,9 @@
 # The canonical copy of this spec file is upstream at:
-# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in
+# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2025.1
+Version: 2025.2
 Release: %autorelease
 License: LGPL-2.0-or-later
 URL: https://github.com/coreos/rpm-ostree
@@ -11,11 +11,10 @@ URL: https://github.com/coreos/rpm-ostree
 # 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}
-
+# See https://github.com/coreos/fedora-coreos-tracker/issues/1716
 # ostree not on i686 for RHEL 10
 # https://github.com/containers/composefs/pull/229#issuecomment-1838735764
-%if 0%{?rhel} >= 10
+%if 0%{?fedora} || 0%{?rhel} >= 10
 ExcludeArch:    %{ix86}
 %endif
 
@@ -32,8 +31,14 @@ BuildRequires: rust
 %bcond_with sanitizers
 # Embedded unit tests
 %bcond_with bin_unit_tests
-# Don't add the ostree-container binaries
-%bcond_with ostree_ext
+
+# Don't add the ostree-container binaries; this version
+# conditional needs to be kept in sync with the bootc one.
+%if 0%{?rhel} >= 10 || 0%{?fedora} > 41
+    %bcond_with ostree_ext
+%else
+    %bcond_without ostree_ext
+%endif
 
 # This is copied from the libdnf spec
 %if 0%{?rhel} && ! 0%{?centos}
@@ -151,14 +156,13 @@ Requires: fuse
 Requires: fuse3
 %endif
 
-# ref https://github.com/coreos/rpm-ostree/issues/4994
+# For container functionality
+# https://github.com/coreos/rpm-ostree/issues/3286
+Requires: skopeo
 Requires: bootc
 %if %{without ostree_ext}
 Requires: ostree-cli(ostree-container)
 %endif
-# For container functionality
-# https://github.com/coreos/rpm-ostree/issues/3286
-Requires: skopeo
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -205,6 +209,8 @@ export RUSTFLAGS="%{build_rustflags}"
 %cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
 %cargo_vendor_manifest
+# https://pagure.io/fedora-rust/rust-packaging/issue/33
+sed -i -e '/https:\/\//d' cargo-vendor.txt
 %endif
 
 %install
diff --git a/sources b/sources
index 8ebdae5..01a3bb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2025.1.tar.xz) = 49ff51e5e94ab5d735540a52fcba657021de949e601501a58eb374f7e07faf3716a3cb758824cc88ffa6e7e2723d4d8085b92a641d5fdc7e43eb38e041ba1217
+SHA512 (rpm-ostree-2025.2.tar.xz) = 1aa52ee46f604f2bbff7e3d4bdb9d246dda2a24457cf971a5c7f5786f7c78356b0f1bada00ca7db9988e8cbfe8c943bad27ef731370c284876694030eef310be