diff --git a/_service b/_service index 7bb871f..4851f77 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/containers/storage.git git storage - v1.38.2 + v1.44.0 @PARENT_TAG@ v(.*) @@ -11,15 +11,7 @@ https://github.com/containers/image.git git image - v5.19.1 - @PARENT_TAG@ - v(.*) - - - https://github.com/containers/podman.git - git - podman - v3.4.4 + v5.23.1 @PARENT_TAG@ v(.*) @@ -27,7 +19,7 @@ https://github.com/containers/common.git git common - v0.47.3 + v0.50.1 @PARENT_TAG@ v(.*) diff --git a/common-0.47.3.tar.xz b/common-0.47.3.tar.xz deleted file mode 100644 index f8be8b9..0000000 --- a/common-0.47.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3185d1fae6bea4b78294a7bac19a1fb60e7824a78cc9c11be9677582c02e6b5c -size 4763172 diff --git a/common-0.50.1.tar.xz b/common-0.50.1.tar.xz new file mode 100644 index 0000000..9ed7d65 --- /dev/null +++ b/common-0.50.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b5a1f9351a27dff49b27bf915a4c4ed844c00f347cd67f1f569884ed2438c3e +size 5141248 diff --git a/image-5.19.1.tar.xz b/image-5.19.1.tar.xz deleted file mode 100644 index 1d855d9..0000000 --- a/image-5.19.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3334eed241701163e1fa0b17a4f8a0e1b448ce556600c3f7f4e26438969357bc -size 400580 diff --git a/image-5.23.1.tar.xz b/image-5.23.1.tar.xz new file mode 100644 index 0000000..f348dfb --- /dev/null +++ b/image-5.23.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:816828e0d79d40aae82448a3750cf55d499a32689e457d1f23be943d7352a07e +size 461128 diff --git a/libcontainers-common.changes b/libcontainers-common.changes index c2163b0..87f55b8 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 22 12:48:38 UTC 2022 - Dan Čermák + +- Update bundled common to 0.50.1 +- Update bundled image to 5.23.1 +- Update bundled storage to 1.44.0 +- Drop bundled podman +- Bump version to 20221122 +- Install container-storage-driver.sh in /etc/ on Leap & SLE + ------------------------------------------------------------------- Thu Nov 17 10:51:26 UTC 2022 - Dirk Müller diff --git a/libcontainers-common.spec b/libcontainers-common.spec index bec1206..6724459 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -1,7 +1,7 @@ # # spec file for package libcontainers-common # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,13 @@ # commonver - version from containers/common -%define commonver 0.47.3 - -# podman - version from containers/podman -%define podmanver 3.4.4 - +%define commonver 0.50.1 # storagever - version from containers/storage -%define storagever 1.38.2 - +%define storagever 1.44.0 # imagever - version from containers/image -%define imagever 5.19.1 - +%define imagever 5.23.1 Name: libcontainers-common -Version: 20210626 +Version: 20221122 Release: 0 Summary: Configuration files common to github.com/containers License: Apache-2.0 AND GPL-3.0-or-later @@ -42,21 +36,20 @@ Source3: policy.json Source4: storage.conf Source5: mounts.conf Source6: registries.conf -Source7: podman-%{podmanver}.tar.xz -Source8: default.yaml -Source9: common-%{commonver}.tar.xz -Source10: containers.conf -Source11: %{name}.rpmlintrc -Source12: shortnames.conf -Source13: container-storage-driver.sh +Source7: default.yaml +Source8: common-%{commonver}.tar.xz +Source9: containers.conf +Source10: %{name}.rpmlintrc +Source11: shortnames.conf +Source12: container-storage-driver.sh BuildRequires: go-go-md2man +Requires(post): %{_bindir}/grep +Requires(post): %{_bindir}/sed +Requires(post): util-linux-systemd Provides: libcontainers-image = %{version} Provides: libcontainers-storage = %{version} Obsoletes: libcontainers-image < %{version} Obsoletes: libcontainers-storage < %{version} -Requires(post): util-linux-systemd -Requires(post): /usr/bin/grep -Requires(post): /usr/bin/sed BuildArch: noarch %description @@ -64,7 +57,7 @@ Configuration files and manpages shared by tools that are based on the github.com/containers libraries, such as Buildah, CRI-O, Podman and Skopeo. %prep -%setup -Tcq -b0 -b1 -b7 -b9 +%setup -q -Tcq -b0 -b1 -b8 # copy the LICENSE file in the build root cp %{SOURCE2} . @@ -89,8 +82,8 @@ done rename '.5.md' '.5' docs/* rename '.md' '.1' docs/* cd .. -# compile subset of containers/podman manpages -cd podman-%{podmanver} +# compile subset of containers/common manpages +cd common-%{commonver} go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5 cd .. @@ -98,13 +91,13 @@ cd .. # no default mounts %else cat >>%{SOURCE5} <