From f89b62d924173a7b6fbf46943c9fd4654f2e9a3c Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Jan 08 2020 14:04:21 +0000 Subject: podman-1.7.0-2.fc31 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) Signed-off-by: Jindrich Novy --- diff --git a/podman.spec b/podman.spec index 90aee06..39f96d5 100644 --- a/podman.spec +++ b/podman.spec @@ -86,7 +86,7 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: container-selinux +Requires: (container-selinux if selinux-policy) %if 0%{?fedora} Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 @@ -499,6 +499,11 @@ pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# do not include docker and podman-remote man pages in main package +for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do + echo "$file*" >> podman.file-list +done + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -573,7 +578,7 @@ exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} -%files +%files -f podman.file-list %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} @@ -588,8 +593,6 @@ exit 0 %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/*.5* %files docker %{_bindir}/docker @@ -613,6 +616,8 @@ exit 0 %files remote %license LICENSE %{_bindir}/%{name}-remote +%{_mandir}/man1/%{name}-remote*.1* +%{_mandir}/man5/%{name}-remote*.5* %files tests %license LICENSE @@ -625,6 +630,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Jan 08 2020 Jindrich Novy - 2:1.7.1-3 +- require container-selinux only when selinux-policy is installed and + move podman-remote man pages to dedicated package (#1765818) + * Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115