Architecture specific change in rpms/podman.git - Arch-excludes - Fedora mailing-lists

26 May 2023

The package rpms/podman.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/podman.git/commit/?id=f6e2b9b14a805c....
Change:
+ExclusiveArch: aarch64 ppc64le s390x x86_64
Thanks.
Full change:
============
commit 35be92c7523346193a4edba7f3a3906ca294c002
Author: Lokesh Mandvekar lsm5@fedoraproject.org
Date:   Fri May 26 13:40:48 2023 -0400
bump to v4.5.1

diff --git a/.gitignore b/.gitignore
index 55ee588..89dd461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1827,3 +1827,5 @@
 /v4.5.0-rc1.tar.gz
 /v4.5.0-rc2.tar.gz
 /v4.5.0.tar.gz
+/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz
+/v4.5.1.tar.gz
diff --git a/podman.spec b/podman.spec
index 05ca71e..41d456a 100644
--- a/podman.spec
+++ b/podman.spec
@@ -79,7 +79,7 @@
 # https://github.com/containers/gvisor-tap-vsock
 %global import_path_gvproxy %{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
 %global git_gvproxy https://%%7Bimport_path_gvproxy%7D
-%global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
+%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
# podman
 %global git0 https://github.com/containers/%%7Bname%7D
@@ -96,7 +96,7 @@ Epoch: 5
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 4.5.0
+Version: 4.5.1
 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
 Release: %autorelease
 %if %{with golang_arches_future}
@@ -234,7 +234,6 @@ Provides: bundled(golang(github.com/containers/storage))
 Provides: bundled(golang(github.com/containers/storage/drivers/quota))
 Provides: bundled(golang(github.com/containers/storage/pkg/archive))
 Provides: bundled(golang(github.com/containers/storage/pkg/chrootarchive))
-Provides: bundled(golang(github.com/containers/storage/pkg/directory))
 Provides: bundled(golang(github.com/containers/storage/pkg/fileutils))
 Provides: bundled(golang(github.com/containers/storage/pkg/homedir))
 Provides: bundled(golang(github.com/containers/storage/pkg/idmap))
@@ -267,9 +266,9 @@ Provides: bundled(golang(github.com/docker/docker/api/types/swarm))
 Provides: bundled(golang(github.com/docker/docker/api/types/volume))
 Provides: bundled(golang(github.com/docker/docker/pkg/homedir))
 Provides: bundled(golang(github.com/docker/docker/pkg/jsonmessage))
-Provides: bundled(golang(github.com/docker/docker/pkg/meminfo))
 Provides: bundled(golang(github.com/docker/docker/pkg/namesgenerator))
 Provides: bundled(golang(github.com/docker/docker/pkg/parsers))
+Provides: bundled(golang(github.com/docker/docker/pkg/system))
 Provides: bundled(golang(github.com/docker/go-connections/nat))
 Provides: bundled(golang(github.com/docker/go-plugins-helpers/sdk))
 Provides: bundled(golang(github.com/docker/go-plugins-helpers/volume))
@@ -288,7 +287,7 @@ Provides: bundled(golang(github.com/mattn/go-sqlite3))
 Provides: bundled(golang(github.com/moby/term))
 Provides: bundled(golang(github.com/nxadm/tail))
 Provides: bundled(golang(github.com/nxadm/tail/watch))
-Provides: bundled(golang(github.com/onsi/ginkgo/v2))
+Provides: bundled(golang(github.com/onsi/ginkgo))
 Provides: bundled(golang(github.com/onsi/gomega))
 Provides: bundled(golang(github.com/onsi/gomega/format))
 Provides: bundled(golang(github.com/onsi/gomega/gexec))
@@ -484,6 +483,7 @@ cd ..
 ln -s vendor src
 export GOPATH=$(pwd)/_build:$(pwd)
 %gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy
+%gobuild -o bin/gvforwarder %{import_path_gvproxy}/cmd/vm
 cd ..
%{__make} docs docker-docs
@@ -513,6 +513,7 @@ cd ..
 cd %{repo_gvproxy}-%{commit_gvproxy}
 install -dp %{buildroot}%{_libexecdir}/%{name}
 install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
+install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/%{name}
 cd ..
# do not include docker and podman-remote man pages in main package
@@ -581,6 +582,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %doc %{repo_gvproxy}-%{commit_gvproxy}/README.md
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/gvproxy
+%{_libexecdir}/%{name}/gvforwarder
%changelog
 %if %{with changelog}
diff --git a/sources b/sources
index dac3d81..72a79cd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
-SHA512 (gvisor-tap-vsock-aab0ac9367fc5142f5857c36ac2352bcb3c60ab7.tar.gz) = e138125f0fad46f84afebad5769d4428cb29f24ce34e209b21689dc4409487bf2e946c9eb6551297baf36286c9be9a5310a77df4884563cfe247113980f18291
-SHA512 (v4.5.0.tar.gz) = 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac
+SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c
+SHA512 (v4.5.1.tar.gz) = c09af81063dba7125d06bb982ae6db5c1933bb32273f194f90875b5c63b916f94d0daacf09212139ae8dc5f8cfa224e7fd1d83e1a22df19be2adde84583ee049
commit f6e2b9b14a805ccbd806199bdae0028ee2593f93
Author: Lokesh Mandvekar lsm5@fedoraproject.org
Date:   Wed May 24 09:41:45 2023 -0400
rewrite spec to minimize diff with soon to be upstream packit-maintained spec
diff --git a/podman.spec b/podman.spec
index 38209f8..05ca71e 100644
--- a/podman.spec
+++ b/podman.spec
@@ -7,12 +7,58 @@
 %global debug_package %{nil}
 %endif
+# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
+%if !0%{?fedora} && 0%{?rhel} <= 8
+%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 %{?**};
+%endif
+
 %if 0%{?rhel}
 %bcond_with btrfs
+# _user_tmpfiles.d currently undefined on rhel
+%global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d
 %else
 %bcond_without btrfs
 %endif
+# RHEL 8 needs /usr/bin/python3 to build docs
+%if 0%{?rhel} == 8
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%bcond_without modules_load
+%else
+%bcond_with modules_load
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_without go_rpm_macros
+%else
+%bcond_with go_rpm_macros
+%endif
+
+# copr_username is only set on copr environments, not on others like koji
+%if "%{?copr_username}" != "rhcontainerbot"
+%bcond_with copr
+%else
+%bcond_without copr
+%endif
+
+%if 0%{?centos} <= 8
+%bcond_without changelog
+%else
+%bcond_with changelog
+%endif
+
+%if 0%{?fedora}
+%bcond_without golang_arches_future
+%else
+%bcond_with golang_arches_future
+%endif
+
 %global provider github
 %global provider_tld com
 %global project containers
@@ -35,24 +81,37 @@
 %global git_gvproxy https://%%7Bimport_path_gvproxy%7D
 %global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
-%global built_tag v4.5.0
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
+# podman
+%global git0 https://github.com/containers/%%7Bname%7D
Name: podman
+%if %{with copr}
+Epoch: 101
+%else
 Epoch: 5
-Version: %{gen_version}
+%endif
+# DO NOT TOUCH the Version string!
+# The TRUE source of this specfile is:
+# https://github.com/containers/podman/blob/main/rpm/podman.spec
+# If that's what you're reading, Version must be 0, and will be updated by Packit for
+# copr and koji builds.
+# If you're reading this on dist-git, the version is automatically filled in by Packit.
+Version: 4.5.0
 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
 Release: %autorelease
+%if %{with golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
+%else
+ExclusiveArch: aarch64 ppc64le s390x x86_64
+%endif
 Summary: Manage Pods, Containers and Container Images
 URL: https://%%7Bname%7D.io/
 # All SourceN files fetched from upstream
-Source0: %{git0}/archive/%{built_tag}.tar.gz
+Source0: %{git0}/archive/v%{version}.tar.gz
 Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz
 Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
-BuildRequires: gettext-envsubst
+BuildRequires: %{_bindir}/envsubst
 BuildRequires: go-md2man
 %if %{with btrfs}
 BuildRequires: btrfs-progs-devel
@@ -63,7 +122,9 @@ BuildRequires: glibc-devel
 BuildRequires: glibc-static
 BuildRequires: golang
 BuildRequires: git-core
+%if %{with go_rpm_macros}
 BuildRequires: go-rpm-macros
+%endif
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: libgpg-error-devel
@@ -75,6 +136,9 @@ BuildRequires: make
 BuildRequires: ostree-devel
 BuildRequires: systemd
 BuildRequires: systemd-devel
+%if %{with python3}
+BuildRequires: python3
+%endif
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
 %if 0%{?fedora} > 38
@@ -90,156 +154,179 @@ Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
 Provides: %{name}-quadlet
 Obsoletes: %{name}-quadlet <= 5:4.4.0-1
 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
+# TODO: need to find the right action in packit propose-downstream to update
+# the goimports here. None of the actions seem to work so far.
+# DO NOT DELETE BELOW LINE - used for updating downstream goimports
 # vendored libraries
-# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go|module|replace|require))/d'
-Provides: bundled(golang(github.com/Azure/go_ansiterm)) = v0.0.0_20210617225240_d185dfc1b5a1
-Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.2.1
-Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.6.0
-Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.10.0_rc.7
-Provides: bundled(golang(github.com/VividCortex/ewma)) = v1.2.0
-Provides: bundled(golang(github.com/acarl005/stripansi)) = v0.0.0_20180116102854_5a71ef0e047d
-Provides: bundled(golang(github.com/asaskevich/govalidator)) = v0.0.0_20230301143203_a9d515a09cc2
-Provides: bundled(golang(github.com/blang/semver/v4)) = v4.0.0
-Provides: bundled(golang(github.com/buger/goterm)) = v1.0.4
-Provides: bundled(golang(github.com/checkpoint_restore/checkpointctl)) = v0.1.0
-Provides: bundled(golang(github.com/checkpoint_restore/go_criu/v6)) = v6.3.0
-Provides: bundled(golang(github.com/chzyer/readline)) = v1.5.1
-Provides: bundled(golang(github.com/container_orchestrated_devices/container_device_interface)) = v0.5.4
-Provides: bundled(golang(github.com/containerd/cgroups)) = v1.1.0
-Provides: bundled(golang(github.com/containerd/containerd)) = v1.7.0
-Provides: bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.14.3
-Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.2
-Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.2.0
-Provides: bundled(golang(github.com/containers/buildah)) = v1.30.0
-Provides: bundled(golang(github.com/containers/common)) = v0.52.0
-Provides: bundled(golang(github.com/containers/conmon)) = v2.0.20+incompatible
-Provides: bundled(golang(github.com/containers/image/v5)) = v5.25.0
-Provides: bundled(golang(github.com/containers/libhvee)) = v0.0.2
-Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20230121012942_c1716e8a8d01
-Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.7
-Provides: bundled(golang(github.com/containers/psgo)) = v1.8.0
-Provides: bundled(golang(github.com/containers/storage)) = v1.46.1
-Provides: bundled(golang(github.com/coreos/go_oidc/v3)) = v3.5.0
-Provides: bundled(golang(github.com/coreos/go_systemd)) = v0.0.0_20190719114852_fd7a80b32e1f
-Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.5.0
-Provides: bundled(golang(github.com/coreos/stream_metadata_go)) = v0.4.1
-Provides: bundled(golang(github.com/cyberphone/json_canonicalization)) = v0.0.0_20220623050100_57a0ce2678a7
-Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.3
-Provides: bundled(golang(github.com/davecgh/go_spew)) = v1.1.1
-Provides: bundled(golang(github.com/digitalocean/go_libvirt)) = v0.0.0_20201209184759_e2a69bcd5bd1
-Provides: bundled(golang(github.com/digitalocean/go_qemu)) = v0.0.0_20210326154740_ac9e0b687001
-Provides: bundled(golang(github.com/disiqueira/gotree/v3)) = v3.0.2
-Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible
-Provides: bundled(golang(github.com/docker/docker)) = v23.0.3+incompatible
-Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.7.0
-Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.1_0.20210727194412_58542c764a11
-Provides: bundled(golang(github.com/docker/go_plugins_helpers)) = v0.0.0_20211224144127_6eecb7beb651
-Provides: bundled(golang(github.com/docker/go_units)) = v0.5.0
-Provides: bundled(golang(github.com/felixge/httpsnoop)) = v1.0.3
-Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.6.0
-Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.9.7
-Provides: bundled(golang(github.com/go_jose/go_jose/v3)) = v3.0.0
-Provides: bundled(golang(github.com/go_logr/logr)) = v1.2.3
-Provides: bundled(golang(github.com/go_logr/stdr)) = v1.2.2
-Provides: bundled(golang(github.com/go_ole/go_ole)) = v1.2.6
-Provides: bundled(golang(github.com/go_openapi/analysis)) = v0.21.4
-Provides: bundled(golang(github.com/go_openapi/errors)) = v0.20.3
-Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.5
-Provides: bundled(golang(github.com/go_openapi/jsonreference)) = v0.20.0
-Provides: bundled(golang(github.com/go_openapi/loads)) = v0.21.2
-Provides: bundled(golang(github.com/go_openapi/runtime)) = v0.25.0
-Provides: bundled(golang(github.com/go_openapi/spec)) = v0.20.8
-Provides: bundled(golang(github.com/go_openapi/strfmt)) = v0.21.7
-Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.3
-Provides: bundled(golang(github.com/go_openapi/validate)) = v0.22.1
-Provides: bundled(golang(github.com/go_playground/locales)) = v0.14.1
-Provides: bundled(golang(github.com/go_playground/universal_translator)) = v0.18.1
-Provides: bundled(golang(github.com/go_playground/validator/v10)) = v10.12.0
-Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.1.1_0.20221029134443_4b691ce883d5
-Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
-Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20210331224755_41bb18bfe9da
-Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.3
-Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.9
-Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.13.0
-Provides: bundled(golang(github.com/google/go_intervals)) = v0.0.2
-Provides: bundled(golang(github.com/google/gofuzz)) = v1.2.0
-Provides: bundled(golang(github.com/google/shlex)) = v0.0.0_20191202100458_e7afc7fbc510
-Provides: bundled(golang(github.com/google/trillian)) = v1.5.1
-Provides: bundled(golang(github.com/google/uuid)) = v1.3.0
-Provides: bundled(golang(github.com/gorilla/handlers)) = v1.5.1
-Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0
-Provides: bundled(golang(github.com/gorilla/schema)) = v1.2.0
-Provides: bundled(golang(github.com/hashicorp/errwrap)) = v1.1.0
-Provides: bundled(golang(github.com/hashicorp/go_cleanhttp)) = v0.5.2
-Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1
-Provides: bundled(golang(github.com/hashicorp/go_retryablehttp)) = v0.7.2
-Provides: bundled(golang(github.com/imdario/mergo)) = v0.3.15
-Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.1.0
-Provides: bundled(golang(github.com/jinzhu/copier)) = v0.3.5
-Provides: bundled(golang(github.com/josharian/intern)) = v1.0.0
-Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12
-Provides: bundled(golang(github.com/klauspost/compress)) = v1.16.4
-Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.6_0.20220930104621_17e8dac29df8
-Provides: bundled(golang(github.com/kr/fs)) = v0.1.0
-Provides: bundled(golang(github.com/leodido/go_urn)) = v1.2.2
-Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20230213213521_fdfea0d469b6
-Provides: bundled(golang(github.com/mailru/easyjson)) = v0.7.7
-Provides: bundled(golang(github.com/manifoldco/promptui)) = v0.9.0
-Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.14
-Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
-Provides: bundled(golang(github.com/mattn/go_sqlite3)) = v1.14.16
-Provides: bundled(golang(github.com/miekg/pkcs11)) = v1.1.1
-Provides: bundled(golang(github.com/mistifyio/go_zfs/v3)) = v3.0.0
-Provides: bundled(golang(github.com/mitchellh/mapstructure)) = v1.5.0
-Provides: bundled(golang(github.com/moby/patternmatcher)) = v0.5.0
-Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2
-Provides: bundled(golang(github.com/moby/sys/sequential)) = v0.5.0
-Provides: bundled(golang(github.com/moby/term)) = v0.0.0_20221120202655_abb19827d345
-Provides: bundled(golang(github.com/modern_go/concurrent)) = v0.0.0_20180306012644_bacd9c7ef1dd
-Provides: bundled(golang(github.com/modern_go/reflect2)) = v1.0.2
-Provides: bundled(golang(github.com/morikuni/aec)) = v1.0.0
-Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8
-Provides: bundled(golang(github.com/oklog/ulid)) = v1.3.1
-Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.5
-Provides: bundled(golang(github.com/onsi/gomega)) = v1.27.6
-Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
-Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc2.0.20221005185240_3a7f492d3f1b
-Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.5
-Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.1.0_rc.1
-Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20230317050512_e931285f4b69
-Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.11.0
-Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.4
-Provides: bundled(golang(github.com/opentracing/opentracing_go)) = v1.2.0
-Provides: bundled(golang(github.com/ostreedev/ostree_go)) = v0.0.0_20210805093236_719684c64e4f
-Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
-Provides: bundled(golang(github.com/pkg/sftp)) = v1.13.5
-Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0
-Provides: bundled(golang(github.com/proglottis/gpgme)) = v0.1.3
-Provides: bundled(golang(github.com/rivo/uniseg)) = v0.4.4
-Provides: bundled(golang(github.com/rootless_containers/rootlesskit)) = v1.1.0
-Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.10.0
-Provides: bundled(golang(github.com/segmentio/ksuid)) = v1.0.4
-Provides: bundled(golang(github.com/sigstore/fulcio)) = v1.2.0
-Provides: bundled(golang(github.com/sigstore/rekor)) = v1.1.0
-Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.6.0
-Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.0
-Provides: bundled(golang(github.com/skratchdot/open_golang)) = v0.0.0_20200116055534_eef842397966
-Provides: bundled(golang(github.com/spf13/cobra)) = v1.7.0
-Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
-Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_20201008174630_78d3cae3a980
-Provides: bundled(golang(github.com/stretchr/testify)) = v1.8.2
-Provides: bundled(golang(github.com/sylabs/sif/v2)) = v2.11.1
-Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
-Provides: bundled(golang(github.com/tchap/go_patricia/v2)) = v2.3.1
-Provides: bundled(golang(github.com/theupdateframework/go_tuf)) = v0.5.2
-Provides: bundled(golang(github.com/titanous/rocacheck)) = v0.0.0_20171023193734_afe73141d399
-Provides: bundled(golang(github.com/uber/jaeger_client_go)) = v2.30.0+incompatible
-Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.11
-Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.3
-Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = v8.3.0
-Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.2.1_beta.2
-Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
-Provides: bundled(golang(sigs.k8s.io/yaml)) = v1.3.0
+Provides: bundled(golang(github.com/BurntSushi/toml))
+Provides: bundled(golang(github.com/blang/semver/v4))
+Provides: bundled(golang(github.com/buger/goterm))
+Provides: bundled(golang(github.com/checkpoint-restore/checkpointctl/lib))
+Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v6))
+Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v6/rpc))
+Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v6/stats))
+Provides: bundled(golang(github.com/container-orchestrated-devices/container-device-interface/pkg/cdi))
+Provides: bundled(golang(github.com/containernetworking/cni/pkg/types/040))
+Provides: bundled(golang(github.com/containernetworking/plugins/pkg/ns))
+Provides: bundled(golang(github.com/containers/buildah))
+Provides: bundled(golang(github.com/containers/buildah/copier))
+Provides: bundled(golang(github.com/containers/buildah/define))
+Provides: bundled(golang(github.com/containers/buildah/imagebuildah))
+Provides: bundled(golang(github.com/containers/buildah/pkg/chrootuser))
+Provides: bundled(golang(github.com/containers/buildah/pkg/cli))
+Provides: bundled(golang(github.com/containers/buildah/pkg/overlay))
+Provides: bundled(golang(github.com/containers/buildah/pkg/parse))
+Provides: bundled(golang(github.com/containers/buildah/pkg/util))
+Provides: bundled(golang(github.com/containers/buildah/util))
+Provides: bundled(golang(github.com/containers/common/libimage))
+Provides: bundled(golang(github.com/containers/common/libimage/define))
+Provides: bundled(golang(github.com/containers/common/libnetwork/cni))
+Provides: bundled(golang(github.com/containers/common/libnetwork/etchosts))
+Provides: bundled(golang(github.com/containers/common/libnetwork/network))
+Provides: bundled(golang(github.com/containers/common/libnetwork/resolvconf))
+Provides: bundled(golang(github.com/containers/common/libnetwork/types))
+Provides: bundled(golang(github.com/containers/common/libnetwork/util))
+Provides: bundled(golang(github.com/containers/common/pkg/apparmor))
+Provides: bundled(golang(github.com/containers/common/pkg/auth))
+Provides: bundled(golang(github.com/containers/common/pkg/capabilities))
+Provides: bundled(golang(github.com/containers/common/pkg/cgroups))
+Provides: bundled(golang(github.com/containers/common/pkg/chown))
+Provides: bundled(golang(github.com/containers/common/pkg/completion))
+Provides: bundled(golang(github.com/containers/common/pkg/config))
+Provides: bundled(golang(github.com/containers/common/pkg/download))
+Provides: bundled(golang(github.com/containers/common/pkg/filters))
+Provides: bundled(golang(github.com/containers/common/pkg/flag))
+Provides: bundled(golang(github.com/containers/common/pkg/hooks))
+Provides: bundled(golang(github.com/containers/common/pkg/hooks/exec))
+Provides: bundled(golang(github.com/containers/common/pkg/machine))
+Provides: bundled(golang(github.com/containers/common/pkg/netns))
+Provides: bundled(golang(github.com/containers/common/pkg/parse))
+Provides: bundled(golang(github.com/containers/common/pkg/report))
+Provides: bundled(golang(github.com/containers/common/pkg/resize))
+Provides: bundled(golang(github.com/containers/common/pkg/seccomp))
+Provides: bundled(golang(github.com/containers/common/pkg/secrets))
+Provides: bundled(golang(github.com/containers/common/pkg/ssh))
+Provides: bundled(golang(github.com/containers/common/pkg/subscriptions))
+Provides: bundled(golang(github.com/containers/common/pkg/sysinfo))
+Provides: bundled(golang(github.com/containers/common/pkg/umask))
+Provides: bundled(golang(github.com/containers/common/pkg/util))
+Provides: bundled(golang(github.com/containers/conmon/runner/config))
+Provides: bundled(golang(github.com/containers/image/v5/copy))
+Provides: bundled(golang(github.com/containers/image/v5/docker))
+Provides: bundled(golang(github.com/containers/image/v5/docker/reference))
+Provides: bundled(golang(github.com/containers/image/v5/manifest))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/cli))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/cli/sigstore))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/compression))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/docker/config))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/shortnames))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/sysregistriesv2))
+Provides: bundled(golang(github.com/containers/image/v5/signature))
+Provides: bundled(golang(github.com/containers/image/v5/signature/signer))
+Provides: bundled(golang(github.com/containers/image/v5/storage))
+Provides: bundled(golang(github.com/containers/image/v5/transports))
+Provides: bundled(golang(github.com/containers/image/v5/transports/alltransports))
+Provides: bundled(golang(github.com/containers/image/v5/types))
+Provides: bundled(golang(github.com/containers/ocicrypt/config))
+Provides: bundled(golang(github.com/containers/ocicrypt/helpers))
+Provides: bundled(golang(github.com/containers/psgo))
+Provides: bundled(golang(github.com/containers/storage))
+Provides: bundled(golang(github.com/containers/storage/drivers/quota))
+Provides: bundled(golang(github.com/containers/storage/pkg/archive))
+Provides: bundled(golang(github.com/containers/storage/pkg/chrootarchive))
+Provides: bundled(golang(github.com/containers/storage/pkg/directory))
+Provides: bundled(golang(github.com/containers/storage/pkg/fileutils))
+Provides: bundled(golang(github.com/containers/storage/pkg/homedir))
+Provides: bundled(golang(github.com/containers/storage/pkg/idmap))
+Provides: bundled(golang(github.com/containers/storage/pkg/idtools))
+Provides: bundled(golang(github.com/containers/storage/pkg/ioutils))
+Provides: bundled(golang(github.com/containers/storage/pkg/lockfile))
+Provides: bundled(golang(github.com/containers/storage/pkg/mount))
+Provides: bundled(golang(github.com/containers/storage/pkg/parsers/kernel))
+Provides: bundled(golang(github.com/containers/storage/pkg/reexec))
+Provides: bundled(golang(github.com/containers/storage/pkg/regexp))
+Provides: bundled(golang(github.com/containers/storage/pkg/stringid))
+Provides: bundled(golang(github.com/containers/storage/pkg/system))
+Provides: bundled(golang(github.com/containers/storage/pkg/unshare))
+Provides: bundled(golang(github.com/containers/storage/types))
+Provides: bundled(golang(github.com/coreos/go-systemd/v22/activation))
+Provides: bundled(golang(github.com/coreos/go-systemd/v22/daemon))
+Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus))
+Provides: bundled(golang(github.com/coreos/stream-metadata-go/fedoracoreos))
+Provides: bundled(golang(github.com/coreos/stream-metadata-go/release))
+Provides: bundled(golang(github.com/coreos/stream-metadata-go/stream))
+Provides: bundled(golang(github.com/cyphar/filepath-securejoin))
+Provides: bundled(golang(github.com/digitalocean/go-qemu/qmp))
+Provides: bundled(golang(github.com/docker/docker/api/types))
+Provides: bundled(golang(github.com/docker/docker/api/types/container))
+Provides: bundled(golang(github.com/docker/docker/api/types/events))
+Provides: bundled(golang(github.com/docker/docker/api/types/mount))
+Provides: bundled(golang(github.com/docker/docker/api/types/network))
+Provides: bundled(golang(github.com/docker/docker/api/types/registry))
+Provides: bundled(golang(github.com/docker/docker/api/types/swarm))
+Provides: bundled(golang(github.com/docker/docker/api/types/volume))
+Provides: bundled(golang(github.com/docker/docker/pkg/homedir))
+Provides: bundled(golang(github.com/docker/docker/pkg/jsonmessage))
+Provides: bundled(golang(github.com/docker/docker/pkg/meminfo))
+Provides: bundled(golang(github.com/docker/docker/pkg/namesgenerator))
+Provides: bundled(golang(github.com/docker/docker/pkg/parsers))
+Provides: bundled(golang(github.com/docker/go-connections/nat))
+Provides: bundled(golang(github.com/docker/go-plugins-helpers/sdk))
+Provides: bundled(golang(github.com/docker/go-plugins-helpers/volume))
+Provides: bundled(golang(github.com/docker/go-units))
+Provides: bundled(golang(github.com/fsnotify/fsnotify))
+Provides: bundled(golang(github.com/godbus/dbus/v5))
+Provides: bundled(golang(github.com/google/gofuzz))
+Provides: bundled(golang(github.com/google/shlex))
+Provides: bundled(golang(github.com/google/uuid))
+Provides: bundled(golang(github.com/gorilla/handlers))
+Provides: bundled(golang(github.com/gorilla/mux))
+Provides: bundled(golang(github.com/gorilla/schema))
+Provides: bundled(golang(github.com/hashicorp/go-multierror))
+Provides: bundled(golang(github.com/json-iterator/go))
+Provides: bundled(golang(github.com/mattn/go-sqlite3))
+Provides: bundled(golang(github.com/moby/term))
+Provides: bundled(golang(github.com/nxadm/tail))
+Provides: bundled(golang(github.com/nxadm/tail/watch))
+Provides: bundled(golang(github.com/onsi/ginkgo/v2))
+Provides: bundled(golang(github.com/onsi/gomega))
+Provides: bundled(golang(github.com/onsi/gomega/format))
+Provides: bundled(golang(github.com/onsi/gomega/gexec))
+Provides: bundled(golang(github.com/onsi/gomega/matchers))
+Provides: bundled(golang(github.com/onsi/gomega/types))
+Provides: bundled(golang(github.com/opencontainers/go-digest))
+Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go/v1))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/cgroups))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/configs))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/devices))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/user))
+Provides: bundled(golang(github.com/opencontainers/runtime-spec/specs-go))
+Provides: bundled(golang(github.com/opencontainers/runtime-tools/generate))
+Provides: bundled(golang(github.com/opencontainers/runtime-tools/validate/capabilities))
+Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux))
+Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux/label))
+Provides: bundled(golang(github.com/openshift/imagebuilder))
+Provides: bundled(golang(github.com/rootless-containers/rootlesskit/pkg/port))
+Provides: bundled(golang(github.com/rootless-containers/rootlesskit/pkg/port/builtin))
+Provides: bundled(golang(github.com/rootless-containers/rootlesskit/pkg/port/portutil))
+Provides: bundled(golang(github.com/sirupsen/logrus))
+Provides: bundled(golang(github.com/sirupsen/logrus/hooks/syslog))
+Provides: bundled(golang(github.com/spf13/cobra))
+Provides: bundled(golang(github.com/spf13/pflag))
+Provides: bundled(golang(github.com/syndtr/gocapability/capability))
+Provides: bundled(golang(github.com/ulikunitz/xz))
+Provides: bundled(golang(github.com/vbauerster/mpb/v8))
+Provides: bundled(golang(github.com/vbauerster/mpb/v8/decor))
+Provides: bundled(golang(github.com/vishvananda/netlink))
+Provides: bundled(golang(go.etcd.io/bbolt))
+Provides: bundled(golang(golang.org/x/net/proxy))
+Provides: bundled(golang(golang.org/x/sync/semaphore))
+Provides: bundled(golang(golang.org/x/sys/unix))
+Provides: bundled(golang(golang.org/x/term))
+Provides: bundled(golang(google.golang.org/protobuf/proto))
+Provides: bundled(golang(gopkg.in/inf.v0))
+Provides: bundled(golang(gopkg.in/yaml.v3))
+Provides: bundled(golang(sigs.k8s.io/yaml))
%description
 %{name} (Pod Manager) is a fully featured container engine that is a simple
@@ -326,7 +413,7 @@ gvisor-tap-vsock brings a configurable DNS server and
 dynamic port forwarding.
%prep
-%autosetup -Sgit -n %{name}-%{built_tag_strip}
+%autosetup -Sgit -n %{name}-%{version}
 sed -i 's;@@PODMAN@@;$(BINDIR);@@PODMAN@@;%{_bindir};' Makefile
# untar dnsname
@@ -363,11 +450,10 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
 # build rootlessport first
 %gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport
-export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
+export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
# build %%{name}
 export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)"
-
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
# build %%{name}-remote
@@ -412,7 +498,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysc
        install.docker \
        install.docker-docs \
        install.remote \
-%if 0%{?fedora} || 0%{?rhel} >= 10
+%if %{with modules_load}
         install.modules-load
 %endif
@@ -460,7 +546,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %{_tmpfilesdir}/%{name}.conf
 %{_systemdgeneratordir}/%{name}-system-generator
 %{_systemdusergeneratordir}/%{name}-user-generator
-%if 0%{?fedora} >= 36 || 0%{?rhel} >= 10
+%if %{with modules_load}
 %{_modulesloaddir}/%{name}-iptables.conf
 %endif
@@ -497,4 +583,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %{_libexecdir}/%{name}/gvproxy
%changelog
+%if %{with changelog}
+* Mon May 01 2023 RH Container Bot rhcontainerbot@fedoraproject.org
+- Placeholder changelog for envs that are not autochangelog-ready
+%else
 %autochangelog
+%endif
commit a37af540a5a52bce056b0032f8d5c3fbb7b4186f
Author: Ed Santiago santiago@redhat.com
Date:   Mon May 8 09:31:11 2023 -0600
Disable systemd resolved
Fixes flake: 'dial tcp: lookup cdn03.quay.io: no such host'
Okay, doesn't actually fix as in _fix_, just fix as in "sweep it
    under the rug". The actual bug is in systemd-resolved, or in the
    quay.io/cloudflare.net DNS nameservers, or in the weird specific
    setup for cdn03 (it's a CNAME, compared to cdn01/02 which are A).
    Maybe a combination of all of the above. I don't care; I just
    want the flakes gone. I realize that this makes our testing
    environment different from default Fedora, and am okay with
    that because I suspect many Fedora users disable systemd-resolved
    as SOP.
Signed-off-by: Ed Santiago santiago@redhat.com
diff --git a/tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh b/tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh
new file mode 100755
index 0000000..f5cb4da
--- /dev/null
+++ b/tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Excerpted from https://github.com/containers/automation_images/blob/main/systemd_banish.sh
+#
+# Early 2023: https://github.com/containers/podman/issues/16973
+#
+# We see countless instances of "lookup cdn03.quay.io" flakes.
+# Disabling the systemd resolver has completely resolved those,
+# from multiple flakes per day to zero in a month.
+#
+# Opinions differ on the merits of systemd-resolve, but the fact is
+# it breaks our CI testing. Kill it.
+nsswitch=/etc/authselect/nsswitch.conf
+if [[ -e $nsswitch ]]; then
+    if grep -q -E 'hosts:.*resolve' $nsswitch; then
+        echo "Disabling systemd-resolved"
+        sed -i -e 's/^(hosts: *).*/\1files dns myhostname/' $nsswitch
+        systemctl disable --now systemd-resolved
+        rm -f /etc/resolv.conf
+
+        # NetworkManager may already be running, or it may not....
+        systemctl start NetworkManager
+        sleep 1
+        systemctl restart NetworkManager
+
+        # ...and it may create resolv.conf upon start/restart, or it
+        # may not. Keep restarting until it does. (Yes, I realize
+        # this is cargocult thinking. Don't care. Not worth the effort
+        # to diagnose and solve properly.)
+        retries=10
+        while ! test -e /etc/resolv.conf;do
+              retries=$((retries - 1))
+              if [[ $retries -eq 0 ]]; then
+                  echo "Timed out waiting for resolv.conf" >&2
+                  echo "...gonna try continuing. Expect failures." >&2
+              fi
+              systemctl restart NetworkManager
+              sleep 5
+        done
+    fi
+fi
diff --git a/tests/roles/disable_systemd_resolved/tasks/main.yml b/tests/roles/disable_systemd_resolved/tasks/main.yml
new file mode 100644
index 0000000..7c77540
--- /dev/null
+++ b/tests/roles/disable_systemd_resolved/tasks/main.yml
@@ -0,0 +1,3 @@
+---
+- name: disable systemd resolved
+  script: ./disable_systemd_resolved.sh
diff --git a/tests/test_podman.yml b/tests/test_podman.yml
index 9674dea..0b4c41b 100644
--- a/tests/test_podman.yml
+++ b/tests/test_podman.yml
@@ -7,6 +7,7 @@
   - artifacts: ./artifacts
     rootless_user: testuser
   roles:
+  - role: disable_systemd_resolved
   - role: rootless_user_ready
tasks:
commit fdd5bef7e5ab0e9c98a3f978ce50108a7661bc87
Author: Lokesh Mandvekar lsm5@fedoraproject.org
Date:   Tue Apr 25 14:19:10 2023 -0400
fix macro
diff --git a/podman.spec b/podman.spec
index 91cd9ec..38209f8 100644
--- a/podman.spec
+++ b/podman.spec
@@ -31,7 +31,7 @@
 # gvproxy
 %global repo_gvproxy gvisor-tap-vsock
 # https://github.com/containers/gvisor-tap-vsock
-%global import_path_gvproxy %%{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
+%global import_path_gvproxy %{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
 %global git_gvproxy https://%%7Bimport_path_gvproxy%7D
 %global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
commit fb6959e0d61f21f21aabb169c24f3b76f4def489
Author: Yaakov Selkowitz yselkowi@redhat.com
Date:   Mon Apr 24 19:16:03 2023 -0400
Disable btrfs in RHEL builds
btrfs-progs is not supported on RHEL.  BUILDTAGS is already set properly
    to compile if not present.
diff --git a/podman.spec b/podman.spec
index bc652fd..91cd9ec 100644
--- a/podman.spec
+++ b/podman.spec
@@ -7,6 +7,12 @@
 %global debug_package %{nil}
 %endif
+%if 0%{?rhel}
+%bcond_with btrfs
+%else
+%bcond_without btrfs
+%endif
+
 %global provider github
 %global provider_tld com
 %global project containers
@@ -48,7 +54,9 @@ Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvpro
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 BuildRequires: gettext-envsubst
 BuildRequires: go-md2man
+%if %{with btrfs}
 BuildRequires: btrfs-progs-devel
+%endif
 BuildRequires: gcc
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel

    