diff --git a/podman.spec b/podman.spec index eaf444b..79805b0 100644 --- a/podman.spec +++ b/podman.spec @@ -20,7 +20,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ Epoch: 2 Name: podman Version: 4.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -38,6 +38,7 @@ Source4: https://github.com/containers/gvisor-tap-vsock/archive/%{commit_gvproxy ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} +Provides: %{name}-catatonit = %{epoch}:%{version}-%{release} BuildRequires: golang >= 1.17.5 BuildRequires: glib2-devel BuildRequires: glibc-devel @@ -55,6 +56,12 @@ BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: shadow-utils-subid-devel +# these BRs are for catatonit +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: file +BuildRequires: gcc +BuildRequires: libtool Requires: containers-common >= 2:1-27 Suggests: containernetworking-plugins >= 0.9.1-1 Requires: netavark @@ -67,7 +74,6 @@ Requires: (container-selinux if selinux-policy) Requires: slirp4netns >= 0.4.0-1 Recommends: crun Requires: fuse-overlayfs -Requires: %{name}-catatonit >= %{epoch}:%{version}-%{release} Requires: oci-runtime %description @@ -108,27 +114,6 @@ service activated. Credentials for this session can be passed in using flags, environment variables, or in containers.conf. -%package catatonit -Summary: A signal-forwarding process manager for containers -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: catatonit < 3:0.1.7-8 -Provides: catatonit -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: file -BuildRequires: gcc -BuildRequires: libtool - -%description catatonit -Catatonit is a /sbin/init program for use within containers. It -forwards (almost) all signals to the spawned child, tears down -the container when the spawned child exits, and otherwise -cleans up other exited processes (zombies). - -This is a reimplementation of other container init programs (such as -"tini" or "dumb-init"), but uses modern Linux facilities (such as -signalfd(2)) and has no additional features. - %package plugins Summary: Plugins for %{name} Requires: dnsmasq @@ -155,7 +140,6 @@ Requires: openssl Requires: buildah Requires: gnupg Requires: git-daemon -Requires: podman-catatonit %description tests %{summary} @@ -299,12 +283,10 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, done # install catatonit -install -dp %{buildroot}%{_libexecdir}/catatonit -install -p catatonit-%{cataver}/catatonit %{buildroot}%{_libexecdir}/catatonit install -dp %{buildroot}%{_libexecdir}/podman -install -dp %{buildroot}%{_datadir}/licenses/podman-catatonit -install -p catatonit-%{cataver}/COPYING %{buildroot}%{_datadir}/licenses/podman-catatonit/COPYING -ln -s %{_libexecdir}/catatonit/catatonit %{buildroot}%{_libexecdir}/podman/catatonit +install -dp %{buildroot}%{_datadir}/licenses/podman +install -p catatonit-%{cataver}/catatonit %{buildroot}%{_libexecdir}/podman/catatonit +install -p catatonit-%{cataver}/COPYING %{buildroot}%{_datadir}/licenses/podman/COPYING-catatonit # install dnsname plugin pushd dnsname-%{commit_dnsname} @@ -359,7 +341,7 @@ fi %{!?_licensedir:%global license %doc} %files -f podman.file-list -%license LICENSE +%license LICENSE COPYING-catatonit %doc README.md CONTRIBUTING.md install.md transfer.md %{_bindir}/%{name} %{_libexecdir}/%{name}/rootlessport @@ -378,6 +360,9 @@ fi %{_userunitdir}/*.socket %{_userunitdir}/*.timer %{_usr}/lib/tmpfiles.d/%{name}.conf +%dir %{_libexecdir}/podman +%{_libexecdir}/podman/catatonit + %files docker %{_bindir}/docker @@ -396,14 +381,6 @@ fi %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name}-remote -%files catatonit -%license COPYING -%doc README.md -%dir %{_libexecdir}/catatonit -%{_libexecdir}/catatonit/catatonit -%dir %{_libexecdir}/podman -%{_libexecdir}/podman/catatonit - %files plugins %license dnsname-%{commit_dnsname}/LICENSE %doc dnsname-%{commit_dnsname}/{README.md,README_PODMAN.md} @@ -421,6 +398,10 @@ fi %{_libexecdir}/%{name}/gvproxy %changelog +* Wed Jan 11 2023 Jindrich Novy - 2:4.3.1-4 +- podman shouldn't provide and file conflict with catatonit in CRB +- Resolves: #2151322 + * Mon Nov 28 2022 Jindrich Novy - 2:4.3.1-3 - fix 'podman manifest add' is not concurrent safe - Resolves: #2105173