[policycoreutils] Fix sepolicy booleans again

[Daniel J Walsh]

commit 435b38a137937430be856e3cfb70d68053fe7d96
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Nov 13 07:05:08 2012 -0500

    Fix sepolicy booleans again
    
    - Fix man page

 policycoreutils-rhat.patch |   17 +++++++++--------
 policycoreutils.spec       |    6 +++++-
 2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index ff54260..41c1e8c 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -337945,7 +337945,7 @@ index 0000000..897f0c4
 +sepolicy(8), selinux(8)
 diff --git a/policycoreutils/sepolicy/sepolicy.8 b/policycoreutils/sepolicy/sepolicy.8
 new file mode 100644
-index 0000000..f7ebdd9
+index 0000000..a40f37d
 --- /dev/null
 +++ b/policycoreutils/sepolicy/sepolicy.8
 @@ -0,0 +1,64 @@
@@ -337954,7 +337954,7 @@ index 0000000..f7ebdd9
 +sepolicy \- SELinux Policy Inspection tool
 +
 +.SH "SYNOPSIS"
-+.B sepolicy [-h] [-P policy_path ] {manpage,network,communicate,transition,generate} OPTIONS
++.B sepolicy [-h] [-P policy_path ] {booleans,communicate,generate,manpage,network,transition} OPTIONS
 +
 +.br
 +Arguments:
@@ -338015,10 +338015,10 @@ index 0000000..f7ebdd9
 +selinux(8), sepolicy-generate(8), sepolicy-communicate(8), sepolicy-generate(8),  sepolicy-network(8), sepolicy-transition(8)
 diff --git a/policycoreutils/sepolicy/sepolicy.py b/policycoreutils/sepolicy/sepolicy.py
 new file mode 100755
-index 0000000..7b6695a
+index 0000000..2647bbc
 --- /dev/null
 +++ b/policycoreutils/sepolicy/sepolicy.py
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,311 @@
 +#! /usr/bin/python -Es
 +# Copyright (C) 2012 Red Hat
 +# AUTHOR: Dan Walsh <dwalsh at redhat.com>
@@ -338234,7 +338234,8 @@ index 0000000..7b6695a
 +    comm.set_defaults(func=communicate)
 +
 +def booleans(args):
-+    from sepolicy import booleans_dict
++    from sepolicy import gen_bool_dict
++    booleans_dict=gen_bool_dict()
 +    if args.all:
 +        args.booleans = booleans_dict.keys()
 +    args.booleans.sort()
@@ -338313,12 +338314,12 @@ index 0000000..7b6695a
 +    parser.add_argument("-P", "--policy", dest="policy",
 +                        action=LoadPolicy, 
 +                        default=None, help=_("Alternate SELinux policy, defaults to /sys/fs/selinux/policy"))
++    gen_booleans_args(subparsers)
++    gen_communicate_args(subparsers)
++    gen_generate_args(subparsers)
 +    gen_manpage_args(subparsers)
 +    gen_network_args(subparsers)
-+    gen_communicate_args(subparsers)
 +    gen_transition_args(subparsers)
-+    gen_generate_args(subparsers)
-+    gen_booleans_args(subparsers)
 +
 +    try:
 +        args = parser.parse_args()
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 940be73..e1d4509 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.13
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -338,6 +338,10 @@ The policycoreutils-restorecond package contains the restorecond service.
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Tue Nov 13 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.12-31
+- Fix sepolicy booleans again
+- Fix man page
+
 * Mon Nov 12 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.12-30
 - Move policy generation tools into policycoreutils-devel