From 0187db596e19d257f52c14ecdf63943da9210c1b Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 3 Aug 2021 10:30:28 +0200 Subject: [PATCH] Drop forgotten ru/ man pages from -restorecond It's was a leftover from the rebase before the latest rebase Fixes: Error: Transaction test error: file /usr/share/man/ru/man8/restorecon_xattr.8.gz from install of policycoreutils-3.2-4.el9.x86_64 conflicts with file from package policycoreutils-restorecond-3.2-5.el9.x86_64 Related: rhbz#1938843 --- policycoreutils.spec | 41 ++++------------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/policycoreutils.spec b/policycoreutils.spec index 108f641..9f27d1d 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -11,7 +11,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 3.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 # https://github.com/SELinuxProject/selinux/wiki/Releases Source0: https://github.com/SELinuxProject/selinux/releases/download/3.2/selinux-3.2.tar.gz @@ -464,42 +464,6 @@ The policycoreutils-restorecond package contains the restorecond service. %{_datadir}/dbus-1/services/org.selinux.Restorecond.service %{_mandir}/man8/restorecond.8* %{_mandir}/ru/man8/restorecond.8* -/usr/share/man/ru/man1/audit2why.1.gz -/usr/share/man/ru/man1/newrole.1.gz -/usr/share/man/ru/man5/sandbox.5.gz -/usr/share/man/ru/man5/selinux_config.5.gz -/usr/share/man/ru/man5/sestatus.conf.5.gz -/usr/share/man/ru/man8/genhomedircon.8.gz -/usr/share/man/ru/man8/restorecon_xattr.8.gz -/usr/share/man/ru/man8/sandbox.8.gz -/usr/share/man/ru/man8/selinux-polgengui.8.gz -/usr/share/man/ru/man8/semanage-boolean.8.gz -/usr/share/man/ru/man8/semanage-dontaudit.8.gz -/usr/share/man/ru/man8/semanage-export.8.gz -/usr/share/man/ru/man8/semanage-fcontext.8.gz -/usr/share/man/ru/man8/semanage-ibendport.8.gz -/usr/share/man/ru/man8/semanage-ibpkey.8.gz -/usr/share/man/ru/man8/semanage-import.8.gz -/usr/share/man/ru/man8/semanage-interface.8.gz -/usr/share/man/ru/man8/semanage-login.8.gz -/usr/share/man/ru/man8/semanage-module.8.gz -/usr/share/man/ru/man8/semanage-node.8.gz -/usr/share/man/ru/man8/semanage-permissive.8.gz -/usr/share/man/ru/man8/semanage-port.8.gz -/usr/share/man/ru/man8/semanage-user.8.gz -/usr/share/man/ru/man8/semodule_unpackage.8.gz -/usr/share/man/ru/man8/sepolgen.8.gz -/usr/share/man/ru/man8/sepolicy-booleans.8.gz -/usr/share/man/ru/man8/sepolicy-communicate.8.gz -/usr/share/man/ru/man8/sepolicy-generate.8.gz -/usr/share/man/ru/man8/sepolicy-gui.8.gz -/usr/share/man/ru/man8/sepolicy-interface.8.gz -/usr/share/man/ru/man8/sepolicy-manpage.8.gz -/usr/share/man/ru/man8/sepolicy-network.8.gz -/usr/share/man/ru/man8/sepolicy-transition.8.gz -/usr/share/man/ru/man8/sepolicy.8.gz -/usr/share/man/ru/man8/seunshare.8.gz -/usr/share/man/ru/man8/system-config-selinux.8.gz %{!?_licensedir:%global license %%doc} %license policycoreutils/COPYING @@ -520,6 +484,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Tue Aug 3 2021 Petr Lautrbach - 3.2-6 +- Drop forgotten ru/ man pages from -restorecond + * Fri Jul 30 2021 Petr Lautrbach - 3.2-5 - Use SHA-2 instead of SHA-1 (#1934964) - Fix COPY_PASTE_ERROR (CWE-398)