* Thu May 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-18

- Fix sandbox error handling on copyfile
- Fix desktop files

policycoreutils-rhat.patch

@@ -1814,8 +1814,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sandbox/sandbox	2010-05-11 16:22:45.000000000 -0400
-@@ -0,0 +1,416 @@
++++ policycoreutils-2.0.82/sandbox/sandbox	2010-05-13 08:55:59.000000000 -0400
+@@ -0,0 +1,421 @@
 +#! /usr/bin/python -E
 +# Authors: Dan Walsh <dwalsh@redhat.com>
 +# Authors: Josh Cogliati
@@ -1895,10 +1895,15 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +                            os.makedirs(newdir)
 +                     dest = newdir + "/" + bname
 +
-+              if os.path.isdir(file):
-+                     shutil.copytree(file, dest)
-+              else:
-+                     shutil.copy2(file, dest)
++              try:
++                     if os.path.isdir(file):
++                            shutil.copytree(file, dest)
++                     else:
++                            shutil.copy2(file, dest)
++              except shutil.Error, elist:
++                     for e in elist:
++                            print e[1]
++                     
 +              X_FILES[file] = (dest, os.path.getmtime(dest))
 +
 +def savefile(new, orig, X_ind):

policycoreutils.spec

@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.82
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -143,7 +143,7 @@ The policycoreutils-python package contains the management tools use to manage a
 %{_mandir}/ru/man8/semanage.8*
 
 %post python
-selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
+selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null 
 exit 0
 
 %package sandbox
@@ -167,7 +167,8 @@ The policycoreutils-python package contains the scripts to create graphical sand
 %{_datadir}/sandbox/sandboxX.sh
 
 %triggerin python -- selinux-policy
-selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
+. /etc/selinux/config
+selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null
 exit 0
 
 %post sandbox
@@ -306,6 +307,10 @@ fi
 exit 0
 
 %changelog
+* Thu May 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-18
+- Fix sandbox error handling on copyfile
+- Fix desktop files
+
 * Tue May 11 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-17
 - Fix policy tool to have correct name in menus
 - Fix seunshare to handle /tmp being in ~/home

selinux-polgengui.desktop

@@ -2,7 +2,7 @@
 Name=SELinux Policy Generation Tool
 Comment=Generate SELinux policy modules
 StartupNotify=true
-Icon=system-config-selinux.png
+Icon=system-config-selinux
 Exec=/usr/bin/selinux-polgengui
 Type=Application
 Terminal=false

system-config-selinux.desktop

@@ -1,9 +1,8 @@
 [Desktop Entry]
 Name=SELinux Management
-GenericName=SELinux
 Comment=Configure SELinux in a graphical setting
 StartupNotify=true
-Icon=/usr/share/system-config-selinux/system-config-selinux.png
+Icon=system-config-selinux
 Exec=/usr/bin/system-config-selinux
 Type=Application
 Terminal=false