Remove lockdown wizard, since gtkhtml2 is no longer supported.

2011-09-06 13:19:19 -04:00 · 2011-09-06 13:19:19 -04:00 · fb1cfc265c
commit fb1cfc265c
parent 04b2851781
2 changed files with 122 additions and 140 deletions
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@ -1,6 +1,6 @@
-diff -up policycoreutils-2.0.86/gui/booleansPage.py.gui policycoreutils-2.0.86/gui/booleansPage.py
--- policycoreutils-2.0.86/gui/booleansPage.py.gui	2011-06-13 13:35:38.766854582 -0400
-+++ policycoreutils-2.0.86/gui/booleansPage.py	2011-06-13 13:35:38.766854582 -0400
+diff -up policycoreutils-2.1.5/gui/booleansPage.py.gui policycoreutils-2.1.5/gui/booleansPage.py
+--- policycoreutils-2.1.5/gui/booleansPage.py.gui	2011-09-06 13:15:33.016804593 -0400
+++ policycoreutils-2.1.5/gui/booleansPage.py	2011-09-06 13:15:33.016804593 -0400
@@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@ -249,9 +249,9 @@ diff -up policycoreutils-2.0.86/gui/booleansPage.py.gui policycoreutils-2.0.86/g
 +        self.load(self.filter)
 +        return True
 +        
-diff -up policycoreutils-2.0.86/gui/domainsPage.py.gui policycoreutils-2.0.86/gui/domainsPage.py
--- policycoreutils-2.0.86/gui/domainsPage.py.gui	2011-06-13 13:35:38.767854591 -0400
-+++ policycoreutils-2.0.86/gui/domainsPage.py	2011-06-13 13:35:38.767854591 -0400
+diff -up policycoreutils-2.1.5/gui/domainsPage.py.gui policycoreutils-2.1.5/gui/domainsPage.py
+--- policycoreutils-2.1.5/gui/domainsPage.py.gui	2011-09-06 13:15:33.016804593 -0400
+++ policycoreutils-2.1.5/gui/domainsPage.py	2011-09-06 13:15:33.017804594 -0400
@@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@ -407,9 +407,9 @@ diff -up policycoreutils-2.0.86/gui/domainsPage.py.gui policycoreutils-2.0.86/gu
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff -up policycoreutils-2.0.86/gui/fcontextPage.py.gui policycoreutils-2.0.86/gui/fcontextPage.py
--- policycoreutils-2.0.86/gui/fcontextPage.py.gui	2011-06-13 13:35:38.768854600 -0400
-+++ policycoreutils-2.0.86/gui/fcontextPage.py	2011-06-13 13:35:38.768854600 -0400
+diff -up policycoreutils-2.1.5/gui/fcontextPage.py.gui policycoreutils-2.1.5/gui/fcontextPage.py
+--- policycoreutils-2.1.5/gui/fcontextPage.py.gui	2011-09-06 13:15:33.017804594 -0400
+++ policycoreutils-2.1.5/gui/fcontextPage.py	2011-09-06 13:15:33.018804595 -0400
@@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -634,9 +634,9 @@ diff -up policycoreutils-2.0.86/gui/fcontextPage.py.gui policycoreutils-2.0.86/g
 +        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 -up policycoreutils-2.0.86/gui/html_util.py.gui policycoreutils-2.0.86/gui/html_util.py
--- policycoreutils-2.0.86/gui/html_util.py.gui	2011-06-13 13:35:38.768854600 -0400
-+++ policycoreutils-2.0.86/gui/html_util.py	2011-06-13 13:35:38.769854608 -0400
+diff -up policycoreutils-2.1.5/gui/html_util.py.gui policycoreutils-2.1.5/gui/html_util.py
+--- policycoreutils-2.1.5/gui/html_util.py.gui	2011-09-06 13:15:33.018804595 -0400
+++ policycoreutils-2.1.5/gui/html_util.py	2011-09-06 13:15:33.018804595 -0400
@@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis@redhat.com>
 +#
@ -802,9 +802,9 @@ diff -up policycoreutils-2.0.86/gui/html_util.py.gui policycoreutils-2.0.86/gui/
 +    doc += tail
 +    return doc
 +
-diff -up policycoreutils-2.0.86/gui/lockdown.glade.gui policycoreutils-2.0.86/gui/lockdown.glade
--- policycoreutils-2.0.86/gui/lockdown.glade.gui	2011-06-13 13:35:38.770854616 -0400
-+++ policycoreutils-2.0.86/gui/lockdown.glade	2011-06-13 13:35:38.770854616 -0400
+diff -up policycoreutils-2.1.5/gui/lockdown.glade.gui policycoreutils-2.1.5/gui/lockdown.glade
+--- policycoreutils-2.1.5/gui/lockdown.glade.gui	2011-09-06 13:15:33.020804597 -0400
+++ policycoreutils-2.1.5/gui/lockdown.glade	2011-09-06 13:15:33.020804597 -0400
@@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@ -1577,9 +1577,9 @@ diff -up policycoreutils-2.0.86/gui/lockdown.glade.gui policycoreutils-2.0.86/gu
 +</widget>
 +
 +</glade-interface>
-diff -up policycoreutils-2.0.86/gui/lockdown.gladep.gui policycoreutils-2.0.86/gui/lockdown.gladep
--- policycoreutils-2.0.86/gui/lockdown.gladep.gui	2011-06-13 13:35:38.770854616 -0400
-+++ policycoreutils-2.0.86/gui/lockdown.gladep	2011-06-13 13:35:38.771854624 -0400
+diff -up policycoreutils-2.1.5/gui/lockdown.gladep.gui policycoreutils-2.1.5/gui/lockdown.gladep
+--- policycoreutils-2.1.5/gui/lockdown.gladep.gui	2011-09-06 13:15:33.021804598 -0400
+++ policycoreutils-2.1.5/gui/lockdown.gladep	2011-09-06 13:15:33.021804598 -0400
@@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@ -1588,9 +1588,9 @@ diff -up policycoreutils-2.0.86/gui/lockdown.gladep.gui policycoreutils-2.0.86/g
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff -up policycoreutils-2.0.86/gui/lockdown.py.gui policycoreutils-2.0.86/gui/lockdown.py
--- policycoreutils-2.0.86/gui/lockdown.py.gui	2011-06-13 13:35:38.773854641 -0400
-+++ policycoreutils-2.0.86/gui/lockdown.py	2011-06-13 13:35:38.773854641 -0400
+diff -up policycoreutils-2.1.5/gui/lockdown.py.gui policycoreutils-2.1.5/gui/lockdown.py
+--- policycoreutils-2.1.5/gui/lockdown.py.gui	2011-09-06 13:15:33.022804599 -0400
+++ policycoreutils-2.1.5/gui/lockdown.py	2011-09-06 13:15:33.022804599 -0400
@@ -0,0 +1,382 @@
 +#!/usr/bin/python -Es
 +#
@ -1974,9 +1974,9 @@ diff -up policycoreutils-2.0.86/gui/lockdown.py.gui policycoreutils-2.0.86/gui/l
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff -up policycoreutils-2.0.86/gui/loginsPage.py.gui policycoreutils-2.0.86/gui/loginsPage.py
--- policycoreutils-2.0.86/gui/loginsPage.py.gui	2011-06-13 13:35:38.775854659 -0400
-+++ policycoreutils-2.0.86/gui/loginsPage.py	2011-06-13 13:35:38.775854659 -0400
+diff -up policycoreutils-2.1.5/gui/loginsPage.py.gui policycoreutils-2.1.5/gui/loginsPage.py
+--- policycoreutils-2.1.5/gui/loginsPage.py.gui	2011-09-06 13:15:33.023804600 -0400
+++ policycoreutils-2.1.5/gui/loginsPage.py	2011-09-06 13:15:33.023804600 -0400
@@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -2163,10 +2163,10 @@ diff -up policycoreutils-2.0.86/gui/loginsPage.py.gui policycoreutils-2.0.86/gui
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff -up policycoreutils-2.0.86/gui/Makefile.gui policycoreutils-2.0.86/gui/Makefile
--- policycoreutils-2.0.86/gui/Makefile.gui	2011-06-13 13:35:38.776854668 -0400
-+++ policycoreutils-2.0.86/gui/Makefile	2011-06-13 13:35:38.776854668 -0400
-@@ -0,0 +1,40 @@
+diff -up policycoreutils-2.1.5/gui/Makefile.gui policycoreutils-2.1.5/gui/Makefile
+--- policycoreutils-2.1.5/gui/Makefile.gui	2011-09-06 13:15:33.023804600 -0400
+++ policycoreutils-2.1.5/gui/Makefile	2011-09-06 13:16:40.940907544 -0400
+@@ -0,0 +1,38 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
 +BINDIR ?= $(PREFIX)/bin
@ -2182,14 +2182,13 @@ diff -up policycoreutils-2.0.86/gui/Makefile.gui policycoreutils-2.0.86/gui/Make
 +modulesPage.py \
 +polgen.glade \
 +portsPage.py \
-+lockdown.glade \
 +semanagePage.py \
 +statusPage.py \
 +system-config-selinux.glade \
 +usersPage.py \
 +selinux.tbl
 +
-+all: $(TARGETS) system-config-selinux.py polgengui.py templates lockdown.py polgen.py 
+all: $(TARGETS) system-config-selinux.py polgengui.py templates polgen.py 
 +
 +install: all
 +	-mkdir -p $(SHAREDIR)/templates
@ -2198,7 +2197,6 @@ diff -up policycoreutils-2.0.86/gui/Makefile.gui policycoreutils-2.0.86/gui/Make
 +	install -m 755 polgengui.py $(SHAREDIR)
 +	install -m 755 polgen.py $(SHAREDIR)
 +	(cd $(BINDIR); 	ln -fs ../share/system-config-selinux/polgen.py sepolgen)
-+	install -m 755 lockdown.py $(SHAREDIR)
 +	install -m 644 $(TARGETS) $(SHAREDIR)
 +	install -m 644 templates/*.py $(SHAREDIR)/templates/
 +
@ -2207,9 +2205,9 @@ diff -up policycoreutils-2.0.86/gui/Makefile.gui policycoreutils-2.0.86/gui/Make
 +indent:
 +
 +relabel:
-diff -up policycoreutils-2.0.86/gui/mappingsPage.py.gui policycoreutils-2.0.86/gui/mappingsPage.py
--- policycoreutils-2.0.86/gui/mappingsPage.py.gui	2011-06-13 13:35:38.776854668 -0400
-+++ policycoreutils-2.0.86/gui/mappingsPage.py	2011-06-13 13:35:38.777854677 -0400
+diff -up policycoreutils-2.1.5/gui/mappingsPage.py.gui policycoreutils-2.1.5/gui/mappingsPage.py
+--- policycoreutils-2.1.5/gui/mappingsPage.py.gui	2011-09-06 13:15:33.024804601 -0400
+++ policycoreutils-2.1.5/gui/mappingsPage.py	2011-09-06 13:15:33.024804601 -0400
@@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -2267,9 +2265,9 @@ diff -up policycoreutils-2.0.86/gui/mappingsPage.py.gui policycoreutils-2.0.86/g
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff -up policycoreutils-2.0.86/gui/modulesPage.py.gui policycoreutils-2.0.86/gui/modulesPage.py
--- policycoreutils-2.0.86/gui/modulesPage.py.gui	2011-06-13 13:35:38.778854686 -0400
-+++ policycoreutils-2.0.86/gui/modulesPage.py	2011-06-13 13:35:38.778854686 -0400
+diff -up policycoreutils-2.1.5/gui/modulesPage.py.gui policycoreutils-2.1.5/gui/modulesPage.py
+--- policycoreutils-2.1.5/gui/modulesPage.py.gui	2011-09-06 13:15:33.025804602 -0400
+++ policycoreutils-2.1.5/gui/modulesPage.py	2011-09-06 13:15:33.025804602 -0400
@@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@ -2461,9 +2459,9 @@ diff -up policycoreutils-2.0.86/gui/modulesPage.py.gui policycoreutils-2.0.86/gu
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff -up policycoreutils-2.0.86/gui/polgen.glade.gui policycoreutils-2.0.86/gui/polgen.glade
--- policycoreutils-2.0.86/gui/polgen.glade.gui	2011-06-13 13:35:38.782854720 -0400
-+++ policycoreutils-2.0.86/gui/polgen.glade	2011-06-13 13:35:38.783854728 -0400
+diff -up policycoreutils-2.1.5/gui/polgen.glade.gui policycoreutils-2.1.5/gui/polgen.glade
+--- policycoreutils-2.1.5/gui/polgen.glade.gui	2011-09-06 13:15:33.028804605 -0400
+++ policycoreutils-2.1.5/gui/polgen.glade	2011-09-06 13:15:33.030804607 -0400
@@ -0,0 +1,3432 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@ -5897,9 +5895,9 @@ diff -up policycoreutils-2.0.86/gui/polgen.glade.gui policycoreutils-2.0.86/gui/
 +</widget>
 +
 +</glade-interface>
-diff -up policycoreutils-2.0.86/gui/polgen.gladep.gui policycoreutils-2.0.86/gui/polgen.gladep
--- policycoreutils-2.0.86/gui/polgen.gladep.gui	2011-06-13 13:35:38.784854736 -0400
-+++ policycoreutils-2.0.86/gui/polgen.gladep	2011-06-13 13:35:38.784854736 -0400
+diff -up policycoreutils-2.1.5/gui/polgen.gladep.gui policycoreutils-2.1.5/gui/polgen.gladep
+--- policycoreutils-2.1.5/gui/polgen.gladep.gui	2011-09-06 13:15:33.030804607 -0400
+++ policycoreutils-2.1.5/gui/polgen.gladep	2011-09-06 13:15:33.031804608 -0400
@@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@ -5908,9 +5906,9 @@ diff -up policycoreutils-2.0.86/gui/polgen.gladep.gui policycoreutils-2.0.86/gui
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff -up policycoreutils-2.0.86/gui/polgengui.py.gui policycoreutils-2.0.86/gui/polgengui.py
--- policycoreutils-2.0.86/gui/polgengui.py.gui	2011-06-13 13:35:38.786854754 -0400
-+++ policycoreutils-2.0.86/gui/polgengui.py	2011-06-13 13:35:38.786854754 -0400
+diff -up policycoreutils-2.1.5/gui/polgengui.py.gui policycoreutils-2.1.5/gui/polgengui.py
+--- policycoreutils-2.1.5/gui/polgengui.py.gui	2011-09-06 13:15:33.032804609 -0400
+++ policycoreutils-2.1.5/gui/polgengui.py	2011-09-06 13:15:33.032804609 -0400
@@ -0,0 +1,750 @@
 +#!/usr/bin/python -Es
 +#
@ -6662,9 +6660,9 @@ diff -up policycoreutils-2.0.86/gui/polgengui.py.gui policycoreutils-2.0.86/gui/
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/polgen.py
--- policycoreutils-2.0.86/gui/polgen.py.gui	2011-06-13 13:35:38.789854781 -0400
-+++ policycoreutils-2.0.86/gui/polgen.py	2011-07-26 10:08:47.330188867 -0400
+diff -up policycoreutils-2.1.5/gui/polgen.py.gui policycoreutils-2.1.5/gui/polgen.py
+--- policycoreutils-2.1.5/gui/polgen.py.gui	2011-09-06 13:15:33.034804611 -0400
+++ policycoreutils-2.1.5/gui/polgen.py	2011-09-06 13:15:33.034804611 -0400
@@ -0,0 +1,1346 @@
 +#!/usr/bin/python -Es
 +#
@ -8012,9 +8010,9 @@ diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/pol
 +        sys.exit(0)
 +    except ValueError, e:
 +        usage(e)
-diff -up policycoreutils-2.0.86/gui/portsPage.py.gui policycoreutils-2.0.86/gui/portsPage.py
--- policycoreutils-2.0.86/gui/portsPage.py.gui	2011-06-13 13:35:38.790854790 -0400
-+++ policycoreutils-2.0.86/gui/portsPage.py	2011-06-13 13:35:38.791854799 -0400
+diff -up policycoreutils-2.1.5/gui/portsPage.py.gui policycoreutils-2.1.5/gui/portsPage.py
+--- policycoreutils-2.1.5/gui/portsPage.py.gui	2011-09-06 13:15:33.035804612 -0400
+++ policycoreutils-2.1.5/gui/portsPage.py	2011-09-06 13:15:33.035804612 -0400
@@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -8275,9 +8273,9 @@ diff -up policycoreutils-2.0.86/gui/portsPage.py.gui policycoreutils-2.0.86/gui/
 +
 +        return True
 +        
-diff -up policycoreutils-2.0.86/gui/selinux.tbl.gui policycoreutils-2.0.86/gui/selinux.tbl
--- policycoreutils-2.0.86/gui/selinux.tbl.gui	2011-06-13 13:35:38.792854808 -0400
-+++ policycoreutils-2.0.86/gui/selinux.tbl	2011-06-13 13:35:38.793854816 -0400
+diff -up policycoreutils-2.1.5/gui/selinux.tbl.gui policycoreutils-2.1.5/gui/selinux.tbl
+--- policycoreutils-2.1.5/gui/selinux.tbl.gui	2011-09-06 13:15:33.036804613 -0400
+++ policycoreutils-2.1.5/gui/selinux.tbl	2011-09-06 13:15:33.036804613 -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 /")
@ -8513,9 +8511,9 @@ diff -up policycoreutils-2.0.86/gui/selinux.tbl.gui policycoreutils-2.0.86/gui/s
 +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 -up policycoreutils-2.0.86/gui/semanagePage.py.gui policycoreutils-2.0.86/gui/semanagePage.py
--- policycoreutils-2.0.86/gui/semanagePage.py.gui	2011-06-13 13:35:38.794854824 -0400
-+++ policycoreutils-2.0.86/gui/semanagePage.py	2011-06-13 13:35:38.794854824 -0400
+diff -up policycoreutils-2.1.5/gui/semanagePage.py.gui policycoreutils-2.1.5/gui/semanagePage.py
+--- policycoreutils-2.1.5/gui/semanagePage.py.gui	2011-09-06 13:15:33.037804614 -0400
+++ policycoreutils-2.1.5/gui/semanagePage.py	2011-09-06 13:15:33.037804614 -0400
@@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -8685,9 +8683,9 @@ diff -up policycoreutils-2.0.86/gui/semanagePage.py.gui policycoreutils-2.0.86/g
 +        self.load(self.filter)
 +        return True
 +        
-diff -up policycoreutils-2.0.86/gui/statusPage.py.gui policycoreutils-2.0.86/gui/statusPage.py
--- policycoreutils-2.0.86/gui/statusPage.py.gui	2011-06-13 13:35:38.795854832 -0400
-+++ policycoreutils-2.0.86/gui/statusPage.py	2011-06-13 13:35:38.795854832 -0400
+diff -up policycoreutils-2.1.5/gui/statusPage.py.gui policycoreutils-2.1.5/gui/statusPage.py
+--- policycoreutils-2.1.5/gui/statusPage.py.gui	2011-09-06 13:15:33.038804615 -0400
+++ policycoreutils-2.1.5/gui/statusPage.py	2011-09-06 13:15:33.038804615 -0400
@@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@ -8879,10 +8877,10 @@ diff -up policycoreutils-2.0.86/gui/statusPage.py.gui policycoreutils-2.0.86/gui
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff -up policycoreutils-2.0.86/gui/system-config-selinux.glade.gui policycoreutils-2.0.86/gui/system-config-selinux.glade
--- policycoreutils-2.0.86/gui/system-config-selinux.glade.gui	2011-06-13 13:35:38.799854868 -0400
-+++ policycoreutils-2.0.86/gui/system-config-selinux.glade	2011-06-13 13:35:38.800854877 -0400
-@@ -0,0 +1,3024 @@
+diff -up policycoreutils-2.1.5/gui/system-config-selinux.glade.gui policycoreutils-2.1.5/gui/system-config-selinux.glade
+--- policycoreutils-2.1.5/gui/system-config-selinux.glade.gui	2011-09-06 13:15:33.041804618 -0400
+++ policycoreutils-2.1.5/gui/system-config-selinux.glade	2011-09-06 13:16:15.397861323 -0400
+@@ -0,0 +1,3005 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@ -10114,7 +10112,6 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.glade.gui policycoreut
 +	<widget class="GtkHPaned" id="hpaned1">
 +	  <property name="visible">True</property>
 +	  <property name="can_focus">True</property>
-+	  <property name="position">0</property>
 +
 +	  <child>
 +	    <widget class="GtkFrame" id="frame1">
@ -10511,24 +10508,6 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.glade.gui policycoreut
 +			  <property name="homogeneous">True</property>
 +			</packing>
 +		      </child>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton36">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Run booleans lockdown wizard</property>
-+			  <property name="label" translatable="yes">Lockdown...</property>
-+			  <property name="use_underline">True</property>
-+			  <property name="stock_id">gtk-print-error</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_lockdown_clicked" last_modification_time="Thu, 03 Jul 2008 16:51:17 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
 +		    </widget>
 +		    <packing>
 +		      <property name="padding">0</property>
@ -11907,9 +11886,9 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.glade.gui policycoreut
 +</widget>
 +
 +</glade-interface>
-diff -up policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui policycoreutils-2.0.86/gui/system-config-selinux.gladep
--- policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui	2011-06-13 13:35:38.801854886 -0400
-+++ policycoreutils-2.0.86/gui/system-config-selinux.gladep	2011-06-13 13:35:38.801854886 -0400
+diff -up policycoreutils-2.1.5/gui/system-config-selinux.gladep.gui policycoreutils-2.1.5/gui/system-config-selinux.gladep
+--- policycoreutils-2.1.5/gui/system-config-selinux.gladep.gui	2011-09-06 13:15:33.042804619 -0400
+++ policycoreutils-2.1.5/gui/system-config-selinux.gladep	2011-09-06 13:15:33.043804620 -0400
@@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@ -11918,9 +11897,9 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui policycoreu
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff -up policycoreutils-2.0.86/gui/system-config-selinux.py.gui policycoreutils-2.0.86/gui/system-config-selinux.py
--- policycoreutils-2.0.86/gui/system-config-selinux.py.gui	2011-06-13 13:35:38.802854894 -0400
-+++ policycoreutils-2.0.86/gui/system-config-selinux.py	2011-06-13 13:35:38.802854894 -0400
+diff -up policycoreutils-2.1.5/gui/system-config-selinux.py.gui policycoreutils-2.1.5/gui/system-config-selinux.py
+--- policycoreutils-2.1.5/gui/system-config-selinux.py.gui	2011-09-06 13:15:33.043804620 -0400
+++ policycoreutils-2.1.5/gui/system-config-selinux.py	2011-09-06 13:15:33.043804620 -0400
@@ -0,0 +1,187 @@
 +#!/usr/bin/python -Es
 +#
@ -12109,9 +12088,9 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.py.gui policycoreutils
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff -up policycoreutils-2.0.86/gui/templates/boolean.py.gui policycoreutils-2.0.86/gui/templates/boolean.py
--- policycoreutils-2.0.86/gui/templates/boolean.py.gui	2011-06-13 13:35:38.804854910 -0400
-+++ policycoreutils-2.0.86/gui/templates/boolean.py	2011-06-13 13:35:38.804854910 -0400
+diff -up policycoreutils-2.1.5/gui/templates/boolean.py.gui policycoreutils-2.1.5/gui/templates/boolean.py
+--- policycoreutils-2.1.5/gui/templates/boolean.py.gui	2011-09-06 13:15:33.044804621 -0400
+++ policycoreutils-2.1.5/gui/templates/boolean.py	2011-09-06 13:15:33.044804621 -0400
@@ -0,0 +1,40 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12153,9 +12132,9 @@ diff -up policycoreutils-2.0.86/gui/templates/boolean.py.gui policycoreutils-2.0
 +')
 +"""
 +
-diff -up policycoreutils-2.0.86/gui/templates/etc_rw.py.gui policycoreutils-2.0.86/gui/templates/etc_rw.py
--- policycoreutils-2.0.86/gui/templates/etc_rw.py.gui	2011-06-13 13:35:38.805854919 -0400
-+++ policycoreutils-2.0.86/gui/templates/etc_rw.py	2011-06-13 13:35:38.806854928 -0400
+diff -up policycoreutils-2.1.5/gui/templates/etc_rw.py.gui policycoreutils-2.1.5/gui/templates/etc_rw.py
+--- policycoreutils-2.1.5/gui/templates/etc_rw.py.gui	2011-09-06 13:15:33.045804622 -0400
+++ policycoreutils-2.1.5/gui/templates/etc_rw.py	2011-09-06 13:15:33.045804622 -0400
@@ -0,0 +1,112 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12269,9 +12248,9 @@ diff -up policycoreutils-2.0.86/gui/templates/etc_rw.py.gui policycoreutils-2.0.
 +fc_dir="""\
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/executable.py.gui policycoreutils-2.0.86/gui/templates/executable.py
--- policycoreutils-2.0.86/gui/templates/executable.py.gui	2011-06-13 13:35:38.807854937 -0400
-+++ policycoreutils-2.0.86/gui/templates/executable.py	2011-06-13 13:35:38.807854937 -0400
+diff -up policycoreutils-2.1.5/gui/templates/executable.py.gui policycoreutils-2.1.5/gui/templates/executable.py
+--- policycoreutils-2.1.5/gui/templates/executable.py.gui	2011-09-06 13:15:33.046804623 -0400
+++ policycoreutils-2.1.5/gui/templates/executable.py	2011-09-06 13:15:33.046804623 -0400
@@ -0,0 +1,451 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12724,9 +12703,9 @@ diff -up policycoreutils-2.0.86/gui/templates/executable.py.gui policycoreutils-
 +
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/__init__.py.gui policycoreutils-2.0.86/gui/templates/__init__.py
--- policycoreutils-2.0.86/gui/templates/__init__.py.gui	2011-06-13 13:35:38.808854946 -0400
-+++ policycoreutils-2.0.86/gui/templates/__init__.py	2011-06-13 13:35:38.808854946 -0400
+diff -up policycoreutils-2.1.5/gui/templates/__init__.py.gui policycoreutils-2.1.5/gui/templates/__init__.py
+--- policycoreutils-2.1.5/gui/templates/__init__.py.gui	2011-09-06 13:15:33.046804623 -0400
+++ policycoreutils-2.1.5/gui/templates/__init__.py	2011-09-06 13:15:33.047804624 -0400
@@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007-2011 Red Hat
@ -12746,9 +12725,9 @@ diff -up policycoreutils-2.0.86/gui/templates/__init__.py.gui policycoreutils-2.
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff -up policycoreutils-2.0.86/gui/templates/network.py.gui policycoreutils-2.0.86/gui/templates/network.py
--- policycoreutils-2.0.86/gui/templates/network.py.gui	2011-06-13 13:35:38.809854955 -0400
-+++ policycoreutils-2.0.86/gui/templates/network.py	2011-06-13 13:35:38.810854964 -0400
+diff -up policycoreutils-2.1.5/gui/templates/network.py.gui policycoreutils-2.1.5/gui/templates/network.py
+--- policycoreutils-2.1.5/gui/templates/network.py.gui	2011-09-06 13:15:33.047804624 -0400
+++ policycoreutils-2.1.5/gui/templates/network.py	2011-09-06 13:15:33.047804624 -0400
@@ -0,0 +1,102 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12852,9 +12831,9 @@ diff -up policycoreutils-2.0.86/gui/templates/network.py.gui policycoreutils-2.0
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff -up policycoreutils-2.0.86/gui/templates/rw.py.gui policycoreutils-2.0.86/gui/templates/rw.py
--- policycoreutils-2.0.86/gui/templates/rw.py.gui	2011-06-13 13:35:38.811854972 -0400
-+++ policycoreutils-2.0.86/gui/templates/rw.py	2011-06-13 13:35:38.811854972 -0400
+diff -up policycoreutils-2.1.5/gui/templates/rw.py.gui policycoreutils-2.1.5/gui/templates/rw.py
+--- policycoreutils-2.1.5/gui/templates/rw.py.gui	2011-09-06 13:15:33.048804625 -0400
+++ policycoreutils-2.1.5/gui/templates/rw.py	2011-09-06 13:15:33.048804625 -0400
@@ -0,0 +1,129 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12985,9 +12964,9 @@ diff -up policycoreutils-2.0.86/gui/templates/rw.py.gui policycoreutils-2.0.86/g
 +fc_dir="""
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/script.py.gui policycoreutils-2.0.86/gui/templates/script.py
--- policycoreutils-2.0.86/gui/templates/script.py.gui	2011-06-13 13:35:38.812854980 -0400
-+++ policycoreutils-2.0.86/gui/templates/script.py	2011-06-13 13:35:38.813854988 -0400
+diff -up policycoreutils-2.1.5/gui/templates/script.py.gui policycoreutils-2.1.5/gui/templates/script.py
+--- policycoreutils-2.1.5/gui/templates/script.py.gui	2011-09-06 13:15:33.049804626 -0400
+++ policycoreutils-2.1.5/gui/templates/script.py	2011-09-06 13:15:33.049804626 -0400
@@ -0,0 +1,126 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13115,9 +13094,9 @@ diff -up policycoreutils-2.0.86/gui/templates/script.py.gui policycoreutils-2.0.
 +_EOF
 +fi
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/semodule.py.gui policycoreutils-2.0.86/gui/templates/semodule.py
--- policycoreutils-2.0.86/gui/templates/semodule.py.gui	2011-06-13 13:35:38.814854997 -0400
-+++ policycoreutils-2.0.86/gui/templates/semodule.py	2011-06-13 13:35:38.814854997 -0400
+diff -up policycoreutils-2.1.5/gui/templates/semodule.py.gui policycoreutils-2.1.5/gui/templates/semodule.py
+--- policycoreutils-2.1.5/gui/templates/semodule.py.gui	2011-09-06 13:15:33.050804627 -0400
+++ policycoreutils-2.1.5/gui/templates/semodule.py	2011-09-06 13:15:33.050804627 -0400
@@ -0,0 +1,41 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13160,9 +13139,9 @@ diff -up policycoreutils-2.0.86/gui/templates/semodule.py.gui policycoreutils-2.
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff -up policycoreutils-2.0.86/gui/templates/tmp.py.gui policycoreutils-2.0.86/gui/templates/tmp.py
--- policycoreutils-2.0.86/gui/templates/tmp.py.gui	2011-06-13 13:35:38.815855006 -0400
-+++ policycoreutils-2.0.86/gui/templates/tmp.py	2011-06-13 13:35:38.815855006 -0400
+diff -up policycoreutils-2.1.5/gui/templates/tmp.py.gui policycoreutils-2.1.5/gui/templates/tmp.py
+--- policycoreutils-2.1.5/gui/templates/tmp.py.gui	2011-09-06 13:15:33.050804627 -0400
+++ policycoreutils-2.1.5/gui/templates/tmp.py	2011-09-06 13:15:33.050804627 -0400
@@ -0,0 +1,102 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13266,9 +13245,9 @@ diff -up policycoreutils-2.0.86/gui/templates/tmp.py.gui policycoreutils-2.0.86/
 +	files_search_tmp($1)
 +	admin_pattern($1, TEMPLATETYPE_tmp_t)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/user.py.gui policycoreutils-2.0.86/gui/templates/user.py
--- policycoreutils-2.0.86/gui/templates/user.py.gui	2011-06-13 13:35:38.816855015 -0400
-+++ policycoreutils-2.0.86/gui/templates/user.py	2011-06-13 13:35:38.817855024 -0400
+diff -up policycoreutils-2.1.5/gui/templates/user.py.gui policycoreutils-2.1.5/gui/templates/user.py
+--- policycoreutils-2.1.5/gui/templates/user.py.gui	2011-09-06 13:15:33.051804628 -0400
+++ policycoreutils-2.1.5/gui/templates/user.py	2011-09-06 13:15:33.051804628 -0400
@@ -0,0 +1,204 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13474,9 +13453,9 @@ diff -up policycoreutils-2.0.86/gui/templates/user.py.gui policycoreutils-2.0.86
 +te_newrole_rules="""
 +seutil_run_newrole(TEMPLATETYPE_t, TEMPLATETYPE_r)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/var_cache.py.gui policycoreutils-2.0.86/gui/templates/var_cache.py
--- policycoreutils-2.0.86/gui/templates/var_cache.py.gui	2011-06-13 13:35:38.818855033 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_cache.py	2011-06-13 13:35:38.818855033 -0400
+diff -up policycoreutils-2.1.5/gui/templates/var_cache.py.gui policycoreutils-2.1.5/gui/templates/var_cache.py
+--- policycoreutils-2.1.5/gui/templates/var_cache.py.gui	2011-09-06 13:15:33.052804629 -0400
+++ policycoreutils-2.1.5/gui/templates/var_cache.py	2011-09-06 13:15:33.052804629 -0400
@@ -0,0 +1,132 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13610,9 +13589,9 @@ diff -up policycoreutils-2.0.86/gui/templates/var_cache.py.gui policycoreutils-2
 +fc_dir="""\
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_cache_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/var_lib.py.gui policycoreutils-2.0.86/gui/templates/var_lib.py
--- policycoreutils-2.0.86/gui/templates/var_lib.py.gui	2011-06-13 13:35:38.819855042 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_lib.py	2011-06-13 13:35:38.819855042 -0400
+diff -up policycoreutils-2.1.5/gui/templates/var_lib.py.gui policycoreutils-2.1.5/gui/templates/var_lib.py
+--- policycoreutils-2.1.5/gui/templates/var_lib.py.gui	2011-09-06 13:15:33.052804629 -0400
+++ policycoreutils-2.1.5/gui/templates/var_lib.py	2011-09-06 13:15:33.053804630 -0400
@@ -0,0 +1,160 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13774,9 +13753,9 @@ diff -up policycoreutils-2.0.86/gui/templates/var_lib.py.gui policycoreutils-2.0
 +fc_dir="""\
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/var_log.py.gui policycoreutils-2.0.86/gui/templates/var_log.py
--- policycoreutils-2.0.86/gui/templates/var_log.py.gui	2011-06-13 13:35:38.821855059 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_log.py	2011-06-13 13:35:38.821855059 -0400
+diff -up policycoreutils-2.1.5/gui/templates/var_log.py.gui policycoreutils-2.1.5/gui/templates/var_log.py
+--- policycoreutils-2.1.5/gui/templates/var_log.py.gui	2011-09-06 13:15:33.053804630 -0400
+++ policycoreutils-2.1.5/gui/templates/var_log.py	2011-09-06 13:15:33.053804630 -0400
@@ -0,0 +1,114 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13892,9 +13871,9 @@ diff -up policycoreutils-2.0.86/gui/templates/var_log.py.gui policycoreutils-2.0
 +fc_dir="""\
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/var_run.py.gui policycoreutils-2.0.86/gui/templates/var_run.py
--- policycoreutils-2.0.86/gui/templates/var_run.py.gui	2011-06-13 13:35:38.822855067 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_run.py	2011-06-13 13:35:38.822855067 -0400
+diff -up policycoreutils-2.1.5/gui/templates/var_run.py.gui policycoreutils-2.1.5/gui/templates/var_run.py
+--- policycoreutils-2.1.5/gui/templates/var_run.py.gui	2011-09-06 13:15:33.054804631 -0400
+++ policycoreutils-2.1.5/gui/templates/var_run.py	2011-09-06 13:15:33.054804631 -0400
@@ -0,0 +1,101 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13997,9 +13976,9 @@ diff -up policycoreutils-2.0.86/gui/templates/var_run.py.gui policycoreutils-2.0
 +fc_dir="""\
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/templates/var_spool.py.gui policycoreutils-2.0.86/gui/templates/var_spool.py
--- policycoreutils-2.0.86/gui/templates/var_spool.py.gui	2011-06-13 13:35:38.823855075 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_spool.py	2011-06-13 13:35:38.824855083 -0400
+diff -up policycoreutils-2.1.5/gui/templates/var_spool.py.gui policycoreutils-2.1.5/gui/templates/var_spool.py
+--- policycoreutils-2.1.5/gui/templates/var_spool.py.gui	2011-09-06 13:15:33.055804632 -0400
+++ policycoreutils-2.1.5/gui/templates/var_spool.py	2011-09-06 13:15:33.055804632 -0400
@@ -0,0 +1,131 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -14132,9 +14111,9 @@ diff -up policycoreutils-2.0.86/gui/templates/var_spool.py.gui policycoreutils-2
 +fc_dir="""\
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff -up policycoreutils-2.0.86/gui/usersPage.py.gui policycoreutils-2.0.86/gui/usersPage.py
--- policycoreutils-2.0.86/gui/usersPage.py.gui	2011-06-13 13:35:38.825855092 -0400
-+++ policycoreutils-2.0.86/gui/usersPage.py	2011-06-13 13:35:38.825855092 -0400
+diff -up policycoreutils-2.1.5/gui/usersPage.py.gui policycoreutils-2.1.5/gui/usersPage.py
+--- policycoreutils-2.1.5/gui/usersPage.py.gui	2011-09-06 13:15:33.055804632 -0400
+++ policycoreutils-2.1.5/gui/usersPage.py	2011-09-06 13:15:33.056804633 -0400
@@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@ -221,7 +221,7 @@ or level of a logged in user.
 Summary: SELinux configuration GUI
 Group: System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
-Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas, gtkhtml2
+Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas
 Requires: usermode-gtk 
 Requires: setools-console
 Requires: selinux-policy
@ -352,6 +352,9 @@ fi
 /bin/systemctl try-restart restorecond.service >/dev/null 2>&1 || :

 %changelog
+* Tue Sep 6 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.5-3
+- Remove lockdown wizard, since gtkhtml2 is no longer supported.
+
 * Fri Sep 2 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.5-2
 - Allow setfiles and restorecon to use labeledprefix to speed up processing 
 and limit memory.