From 1937624126727999e7f1692fb060a81c02284656 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 20 Mar 2008 12:43:37 +0000
Subject: [PATCH] * Wed Mar 19 2008 Dan Walsh <dwalsh@redhat.com> 2.0.46-2 -
 Don't use prefix in gui

---
 policycoreutils-gui.patch  | 298 +++++++++++--------------------------
 policycoreutils-rhat.patch |  12 ++
 policycoreutils.spec       |   5 +-
 3 files changed, 102 insertions(+), 213 deletions(-)

diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index ae1c703..235d5e7 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.42/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.46/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/booleansPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/booleansPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,230 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -232,9 +232,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py poli
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.42/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.46/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/fcontextPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/fcontextPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,217 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -453,9 +453,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.42/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.46/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/loginsPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/loginsPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -642,9 +642,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.42/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.46/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/Makefile	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/Makefile	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -680,9 +680,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.42/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.46/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/mappingsPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/mappingsPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -740,9 +740,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py poli
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.42/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.46/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/modulesPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/modulesPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,195 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -939,9 +939,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.42/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.46/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/polgen.glade	2008-02-13 16:14:51.000000000 -0500
++++ policycoreutils-2.0.46/gui/polgen.glade	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,3221 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -4164,9 +4164,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.42/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.46/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/polgengui.py	2008-02-13 15:08:28.000000000 -0500
++++ policycoreutils-2.0.46/gui/polgengui.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,649 @@
 +#!/usr/bin/python -E
 +#
@@ -4817,9 +4817,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.42/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.46/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/polgen.py	2008-02-13 15:08:24.000000000 -0500
++++ policycoreutils-2.0.46/gui/polgen.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,879 @@
 +#!/usr/bin/python
 +#
@@ -5700,9 +5700,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.42/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.46/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/portsPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/portsPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,258 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5962,9 +5962,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
 +
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.42/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.46/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/selinux.tbl	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/selinux.tbl	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -6200,9 +6200,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.42/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.46/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/semanagePage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/semanagePage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,170 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -6374,9 +6374,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.42/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.46/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/statusPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/statusPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,227 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -6605,10 +6605,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policy
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.42/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.46/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/system-config-selinux.glade	2008-02-05 16:09:43.000000000 -0500
-@@ -0,0 +1,3301 @@
++++ policycoreutils-2.0.46/gui/system-config-selinux.glade	2008-03-20 08:42:24.000000000 -0400
+@@ -0,0 +1,3203 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -7706,7 +7706,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +	  <child>
 +	    <widget class="GtkTable" id="table5">
 +	      <property name="visible">True</property>
-+	      <property name="n_rows">5</property>
++	      <property name="n_rows">3</property>
 +	      <property name="n_columns">2</property>
 +	      <property name="homogeneous">False</property>
 +	      <property name="row_spacing">4</property>
@@ -7741,9 +7741,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +	      </child>
 +
 +	      <child>
-+		<widget class="GtkLabel" id="label33">
++		<widget class="GtkLabel" id="label34">
 +		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">Label Prefix</property>
++		  <property name="label" translatable="yes">MLS/MCS Range</property>
 +		  <property name="use_underline">False</property>
 +		  <property name="use_markup">False</property>
 +		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7769,34 +7769,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +	      </child>
 +
 +	      <child>
-+		<widget class="GtkLabel" id="label34">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">MLS/MCS Range</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">0</property>
-+		  <property name="right_attach">1</property>
-+		  <property name="top_attach">3</property>
-+		  <property name="bottom_attach">4</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
 +		<widget class="GtkEntry" id="mlsRangeEntry">
 +		  <property name="visible">True</property>
 +		  <property name="can_focus">True</property>
@@ -7811,57 +7783,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +		<packing>
 +		  <property name="left_attach">1</property>
 +		  <property name="right_attach">2</property>
-+		  <property name="top_attach">3</property>
-+		  <property name="bottom_attach">4</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label35">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">MLS/MCS Level</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">0</property>
-+		  <property name="right_attach">1</property>
-+		  <property name="top_attach">2</property>
-+		  <property name="bottom_attach">3</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="mlsLevelEntry">
-+		  <property name="visible">True</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="editable">True</property>
-+		  <property name="visibility">True</property>
-+		  <property name="max_length">0</property>
-+		  <property name="text" translatable="yes"></property>
-+		  <property name="has_frame">True</property>
-+		  <property name="invisible_char">*</property>
-+		  <property name="activates_default">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">2</property>
-+		  <property name="bottom_attach">3</property>
++		  <property name="top_attach">1</property>
++		  <property name="bottom_attach">2</property>
 +		  <property name="y_options"></property>
 +		</packing>
 +	      </child>
@@ -7887,8 +7810,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +		<packing>
 +		  <property name="left_attach">0</property>
 +		  <property name="right_attach">1</property>
-+		  <property name="top_attach">4</property>
-+		  <property name="bottom_attach">5</property>
++		  <property name="top_attach">2</property>
++		  <property name="bottom_attach">3</property>
 +		  <property name="x_options">fill</property>
 +		  <property name="y_options"></property>
 +		</packing>
@@ -7909,8 +7832,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +		<packing>
 +		  <property name="left_attach">1</property>
 +		  <property name="right_attach">2</property>
-+		  <property name="top_attach">4</property>
-+		  <property name="bottom_attach">5</property>
++		  <property name="top_attach">2</property>
++		  <property name="bottom_attach">3</property>
 +		  <property name="y_options"></property>
 +		</packing>
 +	      </child>
@@ -7935,27 +7858,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +		  <property name="y_options"></property>
 +		</packing>
 +	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="labelPrefixEntry">
-+		  <property name="visible">True</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="editable">True</property>
-+		  <property name="visibility">True</property>
-+		  <property name="max_length">0</property>
-+		  <property name="text" translatable="yes"></property>
-+		  <property name="has_frame">True</property>
-+		  <property name="invisible_char">*</property>
-+		  <property name="activates_default">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
 +	    </widget>
 +	    <packing>
 +	      <property name="padding">5</property>
@@ -9910,9 +9812,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.42/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.46/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/system-config-selinux.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/system-config-selinux.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,175 @@
 +#!/usr/bin/python
 +#
@@ -10089,9 +9991,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.42/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.46/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/boolean.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/boolean.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10133,9 +10035,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.42/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.46/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/etc_rw.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/etc_rw.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10266,9 +10168,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.42/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.46/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/executable.py	2008-02-08 14:55:16.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/executable.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,328 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10598,9 +10500,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.42/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.46/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/__init__.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/__init__.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -10620,9 +10522,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.p
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.42/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.46/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/network.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/network.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -10704,9 +10606,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.42/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.46/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/rw.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/rw.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10836,9 +10738,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py poli
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.42/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.46/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/script.py	2008-02-13 15:09:17.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/script.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,91 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10931,9 +10833,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.42/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.46/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/semodule.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/semodule.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10976,9 +10878,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.p
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.42/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.46/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/tmp.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/tmp.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11077,9 +10979,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py pol
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.42/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.46/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/user.py	2008-02-13 15:51:31.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/user.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11263,9 +11165,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py po
 +te_newrole_rules="""
 +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.42/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.46/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/var_lib.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_lib.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11425,9 +11327,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.42/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.46/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/var_log.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_log.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11539,9 +11441,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.42/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.46/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/var_run.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_run.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11661,9 +11563,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.42/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.46/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/templates/var_spool.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_spool.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11794,9 +11696,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.42/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.46/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/translationsPage.py	2008-02-05 16:09:43.000000000 -0500
++++ policycoreutils-2.0.46/gui/translationsPage.py	2008-03-19 17:48:48.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -11916,12 +11818,12 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.42/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.46/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.42/gui/usersPage.py	2008-02-05 16:09:43.000000000 -0500
-@@ -0,0 +1,178 @@
++++ policycoreutils-2.0.46/gui/usersPage.py	2008-03-20 08:42:30.000000000 -0400
+@@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
-+## Copyright (C) 2006 Red Hat, Inc.
++## Copyright (C) 2006,2007,2008 Red Hat, Inc.
 +
 +## This program is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published by
@@ -11974,24 +11876,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policyc
 +        col.set_resizable(True)
 +        self.view.append_column(col)
 +
-+        col = gtk.TreeViewColumn(_("Labeling\nPrefix"), gtk.CellRendererText(), text = 1)
-+        col.set_resizable(True)
-+        self.view.append_column(col)
-+        col = gtk.TreeViewColumn(_("MLS/\nMCS Level"), gtk.CellRendererText(), text = 2)
-+        col.set_resizable(True)
-+        self.view.append_column(col)
-+        col = gtk.TreeViewColumn(_("MLS/\nMCS Range"), gtk.CellRendererText(), text = 3)
++        col = gtk.TreeViewColumn(_("MLS/\nMCS Range"), gtk.CellRendererText(), text = 1)
 +        col.set_resizable(True)
 +        self.view.append_column(col)
 +
-+        col = gtk.TreeViewColumn(_("SELinux Roles"), gtk.CellRendererText(), text = 4)
++        col = gtk.TreeViewColumn(_("SELinux Roles"), gtk.CellRendererText(), text = 2)
 +        col.set_resizable(True)
 +        self.view.append_column(col)
 +
 +        self.load()
 +        self.selinuxUserEntry = xml.get_widget("selinuxUserEntry")
-+        self.labelPrefixEntry = xml.get_widget("labelPrefixEntry")
-+        self.mlsLevelEntry = xml.get_widget("mlsLevelEntry")
 +        self.mlsRangeEntry = xml.get_widget("mlsRangeEntry")
 +        self.selinuxRolesEntry = xml.get_widget("selinuxRolesEntry")
 +
@@ -12003,17 +11897,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policyc
 +        keys.sort()
 +        self.store.clear()
 +        for k in keys:
-+            level = seobject.translate(dict[k][1])
 +            range = seobject.translate(dict[k][2])
-+            if not (self.match(k, filter) or self.match(dict[k][0], filter) or self.match(level, filter) or self.match(range, filter) or self.match(dict[k][3], filter)):
++            if not (self.match(k, filter) or self.match(dict[k][0], filter) or self.match(range, filter) or self.match(dict[k][3], filter)):
 +                continue
 +            
 +            iter = self.store.append()
 +            self.store.set_value(iter, 0, k)
-+            self.store.set_value(iter, 1, dict[k][0])
-+            self.store.set_value(iter, 2, level)
-+            self.store.set_value(iter, 3, range)
-+            self.store.set_value(iter, 4, dict[k][3])
++            self.store.set_value(iter, 1, range)
++            self.store.set_value(iter, 2, dict[k][3])
 +        self.view.get_selection().select_path ((0,))
 +
 +    def delete(self):
@@ -12024,61 +11915,44 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policyc
 +        store, iter = self.view.get_selection().get_selected()
 +        self.selinuxUserEntry.set_text(store.get_value(iter, 0))
 +        self.selinuxUserEntry.set_sensitive(False)
-+        self.labelPrefixEntry.set_text(store.get_value(iter, 1))
-+        self.mlsLevelEntry.set_text(store.get_value(iter, 2))
-+        self.mlsRangeEntry.set_text(store.get_value(iter, 3))
-+        self.selinuxRolesEntry.set_text(store.get_value(iter, 4))
-+        protocol=store.get_value(iter, 2)
++        self.mlsRangeEntry.set_text(store.get_value(iter, 1))
++        self.selinuxRolesEntry.set_text(store.get_value(iter, 2))
 +        
 +    def dialogClear(self):
 +        self.selinuxUserEntry.set_text("")
 +        self.selinuxUserEntry.set_sensitive(True)
-+        self.labelPrefixEntry.set_text("")
-+        self.mlsLevelEntry.set_text("s0")
 +        self.mlsRangeEntry.set_text("s0")
 +        self.selinuxRolesEntry.set_text("")
 +        
 +    def add(self):
 +        user = self.selinuxUserEntry.get_text()
-+        prefix = self.labelPrefixEntry.get_text()
-+        level = self.mlsLevelEntry.get_text()
 +        range = self.mlsRangeEntry.get_text()
 +        roles = self.selinuxRolesEntry.get_text()
 +
 +        self.wait()
-+        (rc, out) = commands.getstatusoutput("semanage user -a -R '%s' -r %s-%s -P %s %s" %  (roles, level, range, prefix, user))
++        (rc, out) = commands.getstatusoutput("semanage user -a -R '%s' -r %s %s" %  (roles, range, user))
 +        self.ready()
 +        if rc != 0:
 +            self.error(out)
 +            return False
 +        iter = self.store.append()
 +        self.store.set_value(iter, 0, user)
-+        self.store.set_value(iter, 1, prefix)
-+        self.store.set_value(iter, 2, level)
-+        self.store.set_value(iter, 3, range)
-+        self.store.set_value(iter, 4, roles)
++        self.store.set_value(iter, 1, range)
++        self.store.set_value(iter, 2, roles)
 +        
 +    def modify(self):
 +        user = self.selinuxUserEntry.get_text()
-+        prefix = self.labelPrefixEntry.get_text()
-+        level = self.mlsLevelEntry.get_text()
 +        range = self.mlsRangeEntry.get_text()
 +        roles = self.selinuxRolesEntry.get_text()
 +
 +        self.wait()
-+        (rc, out) = commands.getstatusoutput("semanage user -m -R '%s' -r %s-%s -P %s %s" %  (roles, level, range, prefix, user))
++        (rc, out) = commands.getstatusoutput("semanage user -m -R '%s' -r %s %s" %  (roles, range, user))
 +        self.ready()
 +
 +        if rc != 0:
 +            self.error(out)
 +            return False
-+        store, iter = self.view.get_selection().get_selected()
-+        iter = self.store.append()
-+        self.store.set_value(iter, 0, user)
-+        self.store.set_value(iter, 1, prefix)
-+        self.store.set_value(iter, 2, level)
-+        self.store.set_value(iter, 3, range)
-+        self.store.set_value(iter, 4, roles)
++        self.load(self.filter)
 +
 +    def delete(self):
 +        store, iter = self.view.get_selection().get_selected()
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 99ca400..458245d 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -36,3 +36,15 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
  	}
  	free(scontext);
  	close(fd);
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.44/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2008-01-24 14:41:25.000000000 -0500
++++ policycoreutils-2.0.44/semanage/seobject.py	2008-03-19 17:43:20.000000000 -0400
+@@ -464,7 +464,7 @@
+ 	def __init__(self, store = ""):
+ 		semanageRecords.__init__(self, store)
+ 
+-	def add(self, name, roles, selevel, serange, prefix):
++	def add(self, name, roles, selevel, serange, prefix = "user"):
+ 		if is_mls_enabled == 1:
+ 			if serange == "":
+ 				serange = "s0"
diff --git a/policycoreutils.spec b/policycoreutils.spec
index c679f52..54383c0 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.46
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Wed Mar 19 2008 Dan Walsh <dwalsh@redhat.com> 2.0.46-2
+- Don't use prefix in gui
+
 * Tue Mar 18 2008 Dan Walsh <dwalsh@redhat.com> 2.0.46-1
 - Update to upstream
 	* Update audit2allow to report dontaudit cases from Dan Walsh.