Merge pull request #2700 from lsm5/rpm-sequoia

Packit/RPM: build with sequoia for f43+ and couple of other changes for distro conditionals and easier testing
This commit is contained in:
Miloslav Trmač
2025-09-08 18:55:31 +02:00
committed by GitHub
2 changed files with 21 additions and 10 deletions

View File

@@ -19,7 +19,9 @@ packages:
skopeo-eln: skopeo-eln:
specfile_path: rpm/skopeo.spec specfile_path: rpm/skopeo.spec
# https://packit.dev/docs/configuration/actions
actions: actions:
get-current-version: bash -c 'grep "^const Version" version/version.go | cut -f2 -d\" | tr \- \~'
prepare-files: >- prepare-files: >-
bash -c "sed -i 's/^\(\s*\)ref: .*/\1ref: \"${PACKIT_PROJECT_TAG}\"/' ${PACKIT_DOWNSTREAM_REPO}/plans/main.fmf" bash -c "sed -i 's/^\(\s*\)ref: .*/\1ref: \"${PACKIT_PROJECT_TAG}\"/' ${PACKIT_DOWNSTREAM_REPO}/plans/main.fmf"

View File

@@ -9,25 +9,27 @@
%global gomodulesmode GO111MODULE=on %global gomodulesmode GO111MODULE=on
# No btrfs on RHEL # Distro and environment conditionals
%if %{defined fedora} %if %{defined fedora}
# Fedora conditionals
%define build_with_btrfs 1 %define build_with_btrfs 1
%define conditional_epoch 1
%if %{?fedora} >= 43
%define sequoia 1
%endif %endif
%else
%if %{defined rhel} # RHEL conditionals
%define conditional_epoch 2
%define fips 1 %define fips 1
%endif %endif
# Only used in official koji builds # set higher Epoch only for podman-next builds
# Copr builds set a separate epoch for all environments %if %{defined copr_username} && "%{copr_username}" == "rhcontainerbot" && "%{copr_projectname}" == "podman-next"
%if %{defined fedora} %define next_build 1
%define conditional_epoch 1
%else
%define conditional_epoch 2
%endif %endif
Name: skopeo Name: skopeo
%if %{defined copr_username} %if %{defined next_build}
Epoch: 102 Epoch: 102
%else %else
Epoch: %{conditional_epoch} Epoch: %{conditional_epoch}
@@ -67,6 +69,9 @@ BuildRequires: make
BuildRequires: shadow-utils-subid-devel BuildRequires: shadow-utils-subid-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
Requires: containers-common >= 4:1-21 Requires: containers-common >= 4:1-21
%if %{defined sequoia}
Requires: podman-sequoia
%endif
%description %description
Command line utility to inspect images and repositories directly on Docker Command line utility to inspect images and repositories directly on Docker
@@ -125,6 +130,10 @@ export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs"
export BUILDTAGS="$BUILDTAGS libtrust_openssl" export BUILDTAGS="$BUILDTAGS libtrust_openssl"
%endif %endif
%if %{defined sequoia}
export BUILDTAGS="$BUILDTAGS containers_image_sequoia"
%endif
# unset LDFLAGS earlier set from set_build_flags # unset LDFLAGS earlier set from set_build_flags
LDFLAGS='' LDFLAGS=''