From 86feb38872772228dad25f5cb529bf548a4c0558 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Mon, 31 Mar 2014 08:34:41 -0400 Subject: [PATCH] [PATCH] Add support for Fedora21 html manpage structure - From Miroslav Grepl --- policycoreutils-rhat.patch | 13 +++++++++++++ policycoreutils.spec | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 155ac56..7dd2309 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -682969,3 +682969,16 @@ index 89412d0..b101f08 100644 break; default: usage(); +diff --git a/policycoreutils/sepolicy/sepolicy/manpage.py b/policycoreutils/sepolicy/sepolicy/manpage.py +index afa9922..9af0794 100755 +--- a/policycoreutils/sepolicy/sepolicy/manpage.py ++++ b/policycoreutils/sepolicy/sepolicy/manpage.py +@@ -135,7 +135,7 @@ def prettyprint(f,trim): + manpage_domains = [] + manpage_roles = [] + +-fedora_releases = ["Fedora17","Fedora18","Fedora19","Fedora20"] ++fedora_releases = ["Fedora17","Fedora18","Fedora19","Fedora20","Fedora21"] + rhel_releases = ["RHEL6","RHEL7"] + + def get_alphabet_manpages(manpage_list): diff --git a/policycoreutils.spec b/policycoreutils.spec index 899539f..d666392 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.2.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Base # Based on git repository with tag 20101221 @@ -383,7 +383,11 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog -* Wed Mar 9 2014 Dan Walsh - 2.2.5-9 +* Sun Mar 30 2014 Dan Walsh - 2.2.5-10 +- [PATCH] Add support for Fedora21 html manpage structure +- From Miroslav Grepl + +* Wed Mar 26 2014 Dan Walsh - 2.2.5-9 - mgrepl [PATCH] Deleteall user customization fails if there is a user used - for the default login. We do not want to fail on it and continue to delete - customizations for users which are not used for default login.