diff --git a/.gitignore b/.gitignore index a609cd9..e543672 100644 --- a/.gitignore +++ b/.gitignore @@ -1834,3 +1834,4 @@ /v4.6.0.tar.gz /v4.6.1.tar.gz /v4.6.2.tar.gz +/v4.7.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 4473d84..1a4b257 100644 --- a/podman.spec +++ b/podman.spec @@ -76,7 +76,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.6.2 +Version: 4.7.0~rc1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -88,7 +88,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream -Source0: %{git0}/archive/v%{version}.tar.gz +Source0: %{git0}/archive/v4.7.0-rc1.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz %if %{defined gvproxy_subpackage} Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz @@ -223,13 +223,6 @@ A replacement for libslirp and VPNKit, written in pure Go. It is based on the network stack of gVisor. Compared to libslirp, gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. - -%global desc_gvforwarder Forward traffic from a tap interface over vsock -%package -n gvisor-tap-vsock-gvforwarder -Summary: %{desc_gvforwarder} - -%description -n gvisor-tap-vsock-gvforwarder -%{desc_gvforwarder} %endif %package -n %{name}sh @@ -246,7 +239,7 @@ It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. %prep -%autosetup -Sgit -n %{name}-%{version} +%autosetup -Sgit -n %{name}-4.7.0-rc1 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile # untar dnsname @@ -414,9 +407,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %doc %{repo_gvproxy}-%{commit_gvproxy}/README.md %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy - -%files -n gvisor-tap-vsock-gvforwarder -%dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvforwarder %endif diff --git a/sources b/sources index 8ebecd1..a77bd5d 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (v4.6.2.tar.gz) = 0c89ff3df21e9ca0eb6891600eb86c47463a53bd004d1564cc4661f0ea303dc245b47467d586db29587f960d5c78e0326b7f33ef87ba95e142e3320c56ceaa99 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c +SHA512 (v4.7.0-rc1.tar.gz) = 3a69210db0bc074627818d7990506a361402fbdd70c312464dd351f9664eaea91190fe438cc194cd1f572afbcbba4cf4a187b688c724c1784a01165d8bdaf56c