From 37f64296910cd1b846b8674e4d3af5f03cb819c1 Mon Sep 17 00:00:00 2001 From: HuijingHei Date: Sat, 14 Sep 2024 09:39:21 +0800 Subject: [PATCH 1/2] spec: Do not build on ix86 for fedora --- packaging/rpm-ostree.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/rpm-ostree.spec b/packaging/rpm-ostree.spec index 16c714cc7d..060d5f0ba3 100644 --- a/packaging/rpm-ostree.spec +++ b/packaging/rpm-ostree.spec @@ -11,9 +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 +# 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 From f87116e3ba0703257a451be5804bd6ef0d92eb3b Mon Sep 17 00:00:00 2001 From: HuijingHei Date: Sat, 14 Sep 2024 09:48:20 +0800 Subject: [PATCH 2/2] spec: %autorelease can't be resolved by COPR Fix RPM pakcage name issue like `rpm-ostree-2024.8.28.g3c9febff-%autorelease.x86_64.rpm` --- packaging/rpm-ostree.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/rpm-ostree.spec b/packaging/rpm-ostree.spec index 060d5f0ba3..612d287c45 100644 --- a/packaging/rpm-ostree.spec +++ b/packaging/rpm-ostree.spec @@ -1,10 +1,10 @@ # 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: 2024.7 -Release: %autorelease +Release: 1%{?dist} License: LGPL-2.0-or-later URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"