From bd54d240df651a60a4b155d8fb82b17c5bdbea4f Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Apr 19 2007 13:38:40 +0000
Subject: * Wed Apr 18 2007 Dan Walsh <dwalsh@redhat.com> 2.0.9-9

- More cleanups for gui

---

diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index bb69f0e..ffbfc44 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -888,7 +888,7 @@ 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.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 12:27:57.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 15:15:26.000000000 -0400
 @@ -0,0 +1,1167 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1565,7 +1565,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="druidpagestandard9">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Files and Directories that the application Creates/Modifies</property>
++	      <property name="title" translatable="yes">Files and Directories</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox9">
@@ -2316,7 +2316,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.py	2007-04-18 15:18:32.000000000 -0400
 @@ -0,0 +1,455 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2461,7 +2461,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
 +            if val == True:
 +		self.DEFAULT_DIRS["tmp"][1].append("/tmp");
 +                return
-+            if val != False:
++            if val == False:
 +		self.DEFAULT_DIRS["tmp"][1]=[]
 +                return
 +            raise  ValueError(_("use_tmp must be a boolean value "))
@@ -7020,11 +7020,11 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.p
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-18 15:15:55.000000000 -0400
 @@ -0,0 +1,44 @@
 +te_port_types="""\
 +type TEMPLATETYPE_port_t;
-+corenet_port_type(TEMPLATETYPE_port_t)
++corenet_port(TEMPLATETYPE_port_t)
 +"""
 +
 +te_network="""\
@@ -7676,8 +7676,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-18 13:13:36.000000000 -0400
-@@ -0,0 +1,107 @@
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-19 09:35:34.000000000 -0400
+@@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7703,12 +7703,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# var/spool files
 +type TEMPLATETYPE_spool_t;
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+# var/spool files for TEMPLATETYPE
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:dir manage_dir_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:sock_file create_file_perms;
diff --git a/policycoreutils.spec b/policycoreutils.spec
index e1c457b..d7f5e12 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 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 Apr 18 2007 Dan Walsh <dwalsh@redhat.com> 2.0.9-9
+- More cleanups for gui
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh@redhat.com> 2.0.9-8
 - Fix size and use_tmp problem on gui