rpms/policycoreutils/devel policycoreutils-gui.patch,1.29,1.30

[Daniel J Walsh (dwalsh)]

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
- Change Requires /bin/rpm to rpm


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policycoreutils-gui.patch	10 Sep 2007 15:59:05 -0000	1.29
+++ policycoreutils-gui.patch	10 Sep 2007 16:19:23 -0000	1.30
@@ -3738,8 +3738,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 11:55:14.000000000 -0400
-@@ -0,0 +1,718 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 12:16:38.000000000 -0400
+@@ -0,0 +1,719 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -4118,11 +4118,12 @@
 +
 +        def generate_admin_rules(self):
 +            newte = ""
-+            newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++            if self.type == RUSER:
++                newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
 +            
-+            for app in self.admin_domains:
-+                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
-+                newte += re.sub("APPLICATION", app, tmp)
++                for app in self.admin_domains:
++                    tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
++                    newte += re.sub("APPLICATION", app, tmp)
 +            return newte
 +
 +        def generate_admin_if(self):