diff --git a/.packit.yaml b/.packit.yaml index 83a5d0e..0d3eaca 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -45,16 +45,17 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 + - epel-9-x86_64 + - epel-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 additional_repos: - "copr://rhcontainerbot/podman-next" # Run on commit to main branch - job: copr_build trigger: commit + packages: [podman-fedora] notifications: failure_comment: message: "podman-next COPR build failed. @containers/packit-build please check." @@ -89,7 +90,8 @@ jobs: update_release: false packages: [podman-fedora] dist_git_branches: - - fedora-development # Implies fedora-rawhide and any branched but unreleased version, will include f40 before f40 is marked stable. + - fedora-development + - fedora-latest - job: propose_downstream trigger: release diff --git a/README.packit b/README.packit index 60cc823..3976d54 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.94.2. +The file was generated using packit 0.97.1. diff --git a/podman.spec b/podman.spec index 8353d00..a07ea0c 100644 --- a/podman.spec +++ b/podman.spec @@ -11,13 +11,8 @@ # set it separately here and do not depend on RHEL's go-[s]rpm-macros package # until that's fixed. # c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 -# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331 %if %{defined rhel} && 0%{?rhel} < 10 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; -# python3 dep conditional for rhel8 -%if %{?rhel} == 8 -%define rhel8py3 1 -%endif %endif %global gomodulesmode GO111MODULE=on @@ -96,9 +91,6 @@ BuildRequires: man-db BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -%if %{defined rhel8py3} -BuildRequires: python3 -%endif Requires: catatonit Requires: conmon >= 2:2.1.7-2 %if %{defined fedora} && 0%{?fedora} >= 40 @@ -131,8 +123,6 @@ additional privileges. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. -%{summary} -%{repo} Simple management tool for pods, containers and images %package docker Summary: Emulate Docker CLI using %{name} @@ -153,7 +143,9 @@ pages and %{name}. Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} +%if %{defined fedora} Requires: bats +%endif Requires: jq Requires: skopeo Requires: nmap-ncat