rpms/policycoreutils/devel policycoreutils-gui.patch, 1.16, 1.17 policycoreutils.spec, 1.411, 1.412

Daniel J Walsh (dwalsh) fedora-extras-commits at redhat.com
Thu May 17 17:47:30 UTC 2007


Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24397

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu May 17 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-2
- Fixes for polgentool templates file


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- policycoreutils-gui.patch	30 Apr 2007 13:00:48 -0000	1.16
+++ policycoreutils-gui.patch	17 May 2007 17:46:56 -0000	1.17
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.14/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.16/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/booleansPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/booleansPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -226,9 +226,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.14/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.16/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/fcontextPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/fcontextPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -437,9 +437,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.14/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.16/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/loginsPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/loginsPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -614,9 +614,9 @@
 +        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.14/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.16/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/Makefile	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/Makefile	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -652,9 +652,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.14/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.16/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/mappingsPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/mappingsPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -710,9 +710,9 @@
 +        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.14/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.16/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/modulesPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/modulesPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -886,9 +886,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.14/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.16/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/polgen.glade	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/polgen.glade	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,1168 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -2058,9 +2058,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.14/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.16/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/polgengui.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/polgengui.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,253 @@
 +#!/usr/bin/python
 +#
@@ -2315,9 +2315,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.14/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.16/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/polgen.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/polgen.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,455 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2774,9 +2774,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.14/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.16/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/portsPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/portsPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3005,9 +3005,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.14/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.16/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/selinux.tbl	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/selinux.tbl	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3283,9 +3283,9 @@
 +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.14/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.16/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/semanagePage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/semanagePage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3402,9 +3402,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.14/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.16/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/statusPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/statusPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3626,9 +3626,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.14/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.16/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/system-config-selinux.glade	2007-04-30 08:58:02.000000000 -0400
++++ policycoreutils-2.0.16/gui/system-config-selinux.glade	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,3035 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -6665,9 +6665,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.14/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.16/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/system-config-selinux.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/system-config-selinux.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6838,10 +6838,10 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.14/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.16/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/executable.py	2007-04-30 08:57:42.000000000 -0400
-@@ -0,0 +1,156 @@
++++ policycoreutils-2.0.16/gui/templates/executable.py	2007-05-17 13:41:49.000000000 -0400
+@@ -0,0 +1,154 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -6922,8 +6922,6 @@
 +#
 +
 +# Init script handling
-+init_use_fds(TEMPLATETYPE_t)
-+init_use_script_ptys(TEMPLATETYPE_t)
 +domain_use_interactive_fds(TEMPLATETYPE_t)
 +
 +## internal communication is often done using fifo and unix sockets.
@@ -6998,9 +6996,9 @@
 +EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.14/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.16/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/__init__.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/__init__.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -7020,13 +7018,13 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.14/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.16/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/network.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/network.py	2007-05-17 13:41:29.000000000 -0400
 @@ -0,0 +1,44 @@
 +te_port_types="""\
 +type TEMPLATETYPE_port_t;
-+corenet_port(TEMPLATETYPE_port_t)
++corenet_port_type(TEMPLATETYPE_port_t)
 +"""
 +
 +te_network="""\
@@ -7068,9 +7066,9 @@
 +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind;
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.14/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.16/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/rw.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/rw.py	2007-05-17 13:41:33.000000000 -0400
 @@ -0,0 +1,104 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7097,7 +7095,7 @@
 +########################### tmp Template File #############################
 +te_types="""
 +type TEMPLATETYPE_rw_t;
-+file_type(TEMPLATETYPE_rw_t)
++files_type(TEMPLATETYPE_rw_t)
 +"""
 +
 +te_rules="""
@@ -7176,9 +7174,9 @@
 +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.14/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.16/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/script.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/script.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7222,9 +7220,9 @@
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.14/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.16/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/semodule.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/semodule.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7267,9 +7265,9 @@
 +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.14/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.16/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/tmp.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/tmp.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,72 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7343,9 +7341,9 @@
 +	dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms;
 +')
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.14/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.16/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/var_lib.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/var_lib.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,137 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7484,9 +7482,9 @@
 +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.14/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.16/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/var_log.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/var_log.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,89 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7577,9 +7575,9 @@
 +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.14/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.16/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/var_run.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/var_run.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,95 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7676,9 +7674,9 @@
 +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.14/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.16/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/templates/var_spool.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/templates/var_spool.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7785,9 +7783,9 @@
 +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.14/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.16/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/translationsPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/translationsPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7900,9 +7898,9 @@
 +        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.14/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.16/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.14/gui/usersPage.py	2007-04-30 08:57:42.000000000 -0400
++++ policycoreutils-2.0.16/gui/usersPage.py	2007-05-07 12:59:26.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- policycoreutils.spec	4 May 2007 17:30:00 -0000	1.411
+++ policycoreutils.spec	17 May 2007 17:46:56 -0000	1.412
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Thu May 17 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-2
+- Fixes for polgentool templates file
+
 * Tue May 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-1
 - Updated version of policycoreutils
 	* Merged support for modifying the prefix via semanage from Dan Walsh.




More information about the fedora-extras-commits mailing list