[policycoreutils/f13/master] - Fix translation handling in file context page of system-config-selinux

[Daniel J Walsh]

commit ae8fb9c2cb501b81ca118b013e32b2ca46608617
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Aug 23 11:25:23 2010 -0400

    - Fix translation handling in file context page of system-config-selinux

 policycoreutils-gui.patch |    8 ++++----
 policycoreutils.spec      |    7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index 2921918..228ae74 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -409,7 +409,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py polic
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.83/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.83/gui/fcontextPage.py	2010-07-30 13:50:41.000000000 -0400
++++ policycoreutils-2.0.83/gui/fcontextPage.py	2010-08-23 11:16:44.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -598,14 +598,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
 +            self.error(e.args[0])
 +
 +    def add(self):
++        ftype=["", "--", "-d", "-c", "-b", "-s", "-l", "-p" ]
 +        fspec=self.fcontextEntry.get_text().strip()
 +        type=self.fcontextTypeEntry.get_text().strip()
 +        mls=self.fcontextMLSEntry.get_text().strip()
 +        list_model=self.fcontextFileTypeCombo.get_model()
-+        iter = self.fcontextFileTypeCombo.get_active_iter()
-+        ftype=list_model.get_value(iter,0)
++        active = self.fcontextFileTypeCombo.get_active()
 +        self.wait()
-+        (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype, fspec))
++        (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype[active], fspec))
 +        self.ready()
 +        if rc != 0:
 +            self.error(out)
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 9b64a3e..473b1d9 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,8 +7,8 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.83
-Release: 18%{?dist}
-License: GPLv2+
+Release: 19%{?dist}
+License: GPLv2
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
 Source1: http://www.nsa.gov/selinux/archives/sepolgen-%{sepolgenver}.tgz
@@ -315,6 +315,9 @@ fi
 exit 0
 
 %changelog
+* Mon Aug 23 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-19
+- Fix translation handling in file context page of system-config-selinux
+
 * Fri Aug 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-18
 - Fix sandbox error handling