diff --git a/podman.spec b/podman.spec index 04546f9..c75d886 100644 --- a/podman.spec +++ b/podman.spec @@ -5,21 +5,22 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ %global import_path github.com/containers/podman #%%global branch v4.1.1-rhel -%global commit0 7fe5a419cfd2880df2028ad3d7fd9378a88a04f4 +%global commit0 ad42af94903ce4f3c3cd0693e4e17e4286bf094b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 #%%global dnsnamever 1.3.0 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) %global gvproxyrepo gvisor-tap-vsock -%global gvproxyver 0.2.0 +%global gvproxyver 0.4.0 +%global commit_gvproxy fdc231ae7b8fe1aec4cf0b8777274fa21b70d789 %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) Epoch: 2 Name: podman -Version: 4.2.0 -Release: 3%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -32,7 +33,7 @@ Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz #Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.tar.gz Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz -Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz +Source4: https://github.com/containers/gvisor-tap-vsock/archive/%{commit_gvproxy}/gvisor-tap-vsock-%{commit_gvproxy}.tar.gz # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -265,15 +266,15 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/%{name}-machine github.com/containers/%{name}-machine-cni/plugins/meta/%{name}-machine popd -pushd %{gvproxyrepo}-%{gvproxyver} +pushd gvisor-tap-vsock-%{commit_gvproxy} mkdir _build pushd _build mkdir -p src/github.com/containers -ln -s ../../../../ src/github.com/containers/%{gvproxyrepo} +ln -s ../../../../ src/github.com/containers/gvisor-tap-vsock popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/gvproxy github.com/containers/%{gvproxyrepo}/cmd/gvproxy +%gobuild -o bin/gvproxy github.com/containers/gvisor-tap-vsock/cmd/gvproxy popd %install @@ -315,7 +316,7 @@ pushd %{name}-machine-cni-%{commit_mcni} popd # install gvproxy -pushd %{gvproxyrepo}-%{gvproxyver} +pushd gvisor-tap-vsock-%{commit_gvproxy} install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} popd @@ -380,6 +381,7 @@ fi %files docker %{_bindir}/docker %{_usr}/lib/tmpfiles.d/%{name}-docker.conf +%{_datadir}/user-tmpfiles.d/podman-docker.conf %files remote %license LICENSE @@ -412,12 +414,16 @@ fi %{_datadir}/%{name}/test %files gvproxy -%license %{gvproxyrepo}-%{gvproxyver}/LICENSE -%doc %{gvproxyrepo}-%{gvproxyver}/README.md +%license gvisor-tap-vsock-%{commit_gvproxy}/LICENSE +%doc gvisor-tap-vsock-%{commit_gvproxy}/README.md %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Nov 03 2022 Jindrich Novy - 2:4.3.0-1 +- update to https://github.com/containers/podman/releases/tag/v4.3.0 +- Related: #2124478 + * Mon Aug 22 2022 Jindrich Novy - 2:4.2.0-3 - fix dependency in test subpackage - Related: #2061316 diff --git a/sources b/sources index d95d3bc..db3b54c 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (podman-4.2.0-7fe5a41.tar.gz) = 387837d56267de5ec3be394ca0c754d95df368b3744d36f3f58814b634c9f4484492a174e0a8d15f8daadbec61e00e28a20156ebb0d0546bbeb3327b10c5d029 SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67 -SHA512 (v0.2.0.tar.gz) = 75c71f874d624b0cfe8a3df347072a90a7e3f73a519bbd80296f7ca8ff4ed8cf09167c43a6d3c1c4c19bd074c11a506c2fd7e020ba4289e96419ee7d799ddc83 +SHA512 (gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz) = 9441a6b0dc64961994ec9c268ad81916c4b88bf5c508c32dc6b0f68a993dc0c57c92304bfaa525aafe6445107314fc6954a65dbfb53432450ac0076d7d68c1ba +SHA512 (podman-4.3.0-ad42af9.tar.gz) = 453a30c1a3253d94b8f0c6ff90f9d1ba5fd9be33181847a043b1ada68bd3965478143eb8ee44d2fdb79a3ad351bab52e60a165e663aad9a7ad3201bfc2f68ab6