From fa88ddd59f73737fd735230da0205a1ce1442b950b18069542fd55788fd98e88 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Apr 2021 23:36:27 +0000 Subject: [PATCH] Accepting request 888022 from devel:kubic OBS-URL: https://build.opensuse.org/request/show/888022 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=80 --- _service | 2 +- _servicedata | 2 +- podman-3.1.1.tar.xz | 3 --- podman-3.1.2.tar.xz | 3 +++ podman.changes | 21 ++++++++++++++++++ podman.spec | 53 ++++++++++++++++++++++++++------------------- 6 files changed, 57 insertions(+), 27 deletions(-) delete mode 100644 podman-3.1.1.tar.xz create mode 100644 podman-3.1.2.tar.xz diff --git a/_service b/_service index 626899e..46728ee 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/containers/podman.git git - v3.1.1 + v3.1.2 @PARENT_TAG@ enable v(.*) diff --git a/_servicedata b/_servicedata index 422a227..e84f8d7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/containers/podman.git - 713995bfc325250fefe2750e81d98eb1c65acaec \ No newline at end of file + 51b8ddbc22cf5b10dd76dd9243924aa66ad7db39 \ No newline at end of file diff --git a/podman-3.1.1.tar.xz b/podman-3.1.1.tar.xz deleted file mode 100644 index 600c092..0000000 --- a/podman-3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2047b10504bb2b67e17d451e1906a0977f93e7d76b9a8683d91f5c239cc2dd4 -size 6093796 diff --git a/podman-3.1.2.tar.xz b/podman-3.1.2.tar.xz new file mode 100644 index 0000000..0952a8c --- /dev/null +++ b/podman-3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15aef1efe1a3e1f9bf814f5aac7d1b9eb1f9dc58205848b743a0fe28cb12b171 +size 6088932 diff --git a/podman.changes b/podman.changes index b671909..3799b5c 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Apr 23 10:29:10 UTC 2021 - Fabian Vogt + +- Update to version 3.1.2: + * Bump to v3.1.2 + * Update release notes for v3.1.2 + * Ensure mount destination is clean, no trailing slash + * Fixes podman-remote save to directories does not work + * [CI:DOCS] Add missing dash to verbose option + * [CI:DOCS] Fix Markdown table layout bugs + * [CI:DOCS] Rewrite --uidmap doc in podman-create.1.md and podman-run.1.md + * rmi: don't break when the image is missing a manifest + * Bump containers/image to v5.11.1 + * Bump github.com/coreos/go-systemd from 22.2.0 to 22.3.1 + * Fix lint + * Bump to v3.1.2-dev +- Split podman-remote into a subpackage +- Add missing scriptlets for systemd units +- Escape macros in comments +- Drop some obsolete workarounds, including %{go_nostrip} + ------------------------------------------------------------------- Mon Apr 19 09:29:17 UTC 2021 - alexandre.vicenzi@suse.com diff --git a/podman.spec b/podman.spec index 879190a..8051024 100644 --- a/podman.spec +++ b/podman.spec @@ -22,7 +22,7 @@ %define with_libostree 1 %endif Name: podman -Version: 3.1.1 +Version: 3.1.2 Release: 0 Summary: Daemon-less container engine for managing containers, pods and images License: Apache-2.0 @@ -49,15 +49,7 @@ BuildRequires: libgpgme-devel BuildRequires: libseccomp-devel BuildRequires: golang(API) = 1.13 BuildRequires: pkgconfig(libselinux) -# Podman 3.1.0 requires systemd 241 or newer due to go-systemd -# see https://github.com/coreos/go-systemd/issues/355 -# The next Podman release won't need it probably -# see https://github.com/coreos/go-systemd/pull/358 -BuildRequires: pkgconfig(libsystemd) >= 241 -# Build fails with PIE enabled on ppc64le due to boo#1098017 -%ifarch ppc64le -#!BuildIgnore: gcc-PIE -%endif +BuildRequires: pkgconfig(libsystemd) Recommends: apparmor-abstractions Recommends: apparmor-parser Requires: catatonit @@ -72,7 +64,6 @@ Requires: slirp4netns >= 0.4.0 Requires: timezone Recommends: %{name}-cni-config = %{version} Suggests: katacontainers -%{go_nostrip} %if 0%{?with_libostree} BuildRequires: libostree-devel %endif @@ -88,11 +79,19 @@ skopeo, as they all share the same datastore backend. %prep %setup -q +%package remote +Summary: Client for managing podman containers remotely +Group: System/Management +Conflicts: %{name} < 3.1.2 + +%description remote +This client allows controlling podman on a separate host, e.g. over SSH. + %package cni-config Summary: Basic CNI configuration for podman Group: System/Management Requires: %{name} = %{version} -# iproute2 is needed by the %triggerun scriplet +# iproute2 is needed by the %%triggerun scriplet Requires: iproute2 BuildArch: noarch @@ -150,21 +149,19 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE %endif # Binaries %{_bindir}/podman -%{_bindir}/podman-remote # Manpages %{_mandir}/man1/podman*.1* +%exclude %{_mandir}/man1/podman-remote*.1* # Configs %dir %{_prefix}/lib/modules-load.d %{_prefix}/lib/modules-load.d/podman.conf %{_tmpfilesdir}/podman.conf # Completion %{_datadir}/bash-completion/completions/podman -%{_datadir}/bash-completion/completions/podman-remote %{_datadir}/zsh/site-functions/_podman -%{_datadir}/zsh/site-functions/_podman-remote -%{_datadir}/fish/ +%dir %{_datadir}/fish/ +%dir %{_datadir}/fish/vendor_completions.d/ %{_datadir}/fish/vendor_completions.d/podman.fish -%{_datadir}/fish/vendor_completions.d/podman-remote.fish %{_unitdir}/podman.service %{_unitdir}/podman.socket %{_unitdir}/podman-auto-update.service @@ -177,6 +174,15 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE %ghost %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-libpodconf %license LICENSE +%files remote +%{_bindir}/podman-remote +%{_mandir}/man1/podman-remote*.1* +%{_datadir}/bash-completion/completions/podman-remote +%{_datadir}/zsh/site-functions/_podman-remote +%dir %{_datadir}/fish/ +%dir %{_datadir}/fish/vendor_completions.d/ +%{_datadir}/fish/vendor_completions.d/podman-remote.fish + %files cni-config %config %{_sysconfdir}/cni/net.d/87-podman-bridge.conflist %license LICENSE @@ -190,20 +196,23 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE %tmpfiles_create %{_tmpfilesdir}/podman-docker.conf %pre -%service_add_pre podman.service podman.socket +%service_add_pre podman.service podman.socket podman-auto-update.service podman-auto-update.timer # move away any old rpmsave config file to avoid having it re-activated again in -# %posttrans +# %%posttrans test -f /etc/containers/libpod.conf.rpmsave && mv -v /etc/containers/libpod.conf.rpmsave /etc/containers/libpod.conf.rpmsave.old ||: %post -%service_add_post podman.service podman.socket +%service_add_post podman.service podman.socket podman-auto-update.service podman-auto-update.timer %tmpfiles_create %{_tmpfilesdir}/podman.conf +%systemd_user_post podman.service podman.socket podman-auto-update.service podman-auto-update.timer %preun -%service_del_preun podman.service podman.socket +%service_del_preun podman.service podman.socket podman-auto-update.service podman-auto-update.timer +%systemd_user_preun podman.service podman.socket podman-auto-update.service podman-auto-update.timer %postun -%service_del_postun podman.service podman.socket +%service_del_postun podman.service podman.socket podman-auto-update.service podman-auto-update.timer +%systemd_user_postun podman.service podman.socket podman-auto-update.service podman-auto-update.timer %posttrans # if libpod.conf.rpmsave was created move it back into place and set an update