diff --git a/podman.spec b/podman.spec index 6938a27..420c70d 100644 --- a/podman.spec +++ b/podman.spec @@ -17,7 +17,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/podman %global branch v3.4 -%global commit0 72031783c5152cc715a8f1b6dc39bb5de8bfc3ca +%global commit0 e3a7a743c50f7131fde98380b8059c463468c653 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 %global dnsnamever 1.3.0 @@ -29,7 +29,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: podman Version: 3.4.3 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -207,7 +207,7 @@ ln -s vendor src rm -rf vendor/github.com/containers/storage/drivers/register/register_btrfs.go -export BUILDTAGS="systemd selinux seccomp btrfs_noversion exclude_graphdriver_devicemapper $(hack/libdm_tag.sh)" +export BUILDTAGS="systemd selinux seccomp btrfs_noversion exclude_graphdriver_devicemapper $(hack/libdm_tag.sh) $(hack/libsubid_tag.sh)" # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} @@ -404,6 +404,12 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Tue Nov 23 2021 Jindrich Novy - 1:3.4.3-0.6 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/e3a7a74) +- add libsubid_tag.sh into BUILDTAGS +- Related: #2000051 + * Mon Nov 22 2021 Jindrich Novy - 1:3.4.3-0.5 - do not put patch URL as the backported patch will get overwritten when "spectool -g -f" is executed diff --git a/sources b/sources index 8dc5212..a0ce9b0 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ SHA512 (v0.1.0.tar.gz) = 72d27e2a7c20f956a177bcda96508c1ec7b8ac0a512f9ab1a045bcf SHA512 (v1.3.0.tar.gz) = df48c4715582f098c41d45533163632ac1953621ce91fc78e88cc84e61d8a0a537e6da5aabab2be18cbddccd8e4c867670ae1fbc5ff7b6473bf7f4b464cb6ee2 SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67 -SHA512 (v3.4-7203178.tar.gz) = 2464e4aff01db8c7a3970726f2fbea96f780037f5944d34ea0896b6865f7fd98feb94a1e3b32348a7991af0b3ab0b42b09265c370de7bc0a1df65c1c2b4f874d +SHA512 (v3.4-e3a7a74.tar.gz) = 571b4ad80a3c2b830d60356f2589d04fb7a8b15e45128f27a8cd2a4f9265ca7355486f5c6f85474334c3ffe6e03b0d113dba939297ef27334f9c1044a8c05677