[policycoreutils/f14/master] * Thu Aug 5 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-13 - Remove requirement to run selinux-polgen

[Daniel J Walsh]

commit 1c7e79a94c1cc8c46d322a9cae3af83dc7754972
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Aug 5 14:11:29 2010 -0400

    * Thu Aug 5 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-13
    - Remove requirement to run selinux-polgen as root

 policycoreutils.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/policycoreutils.spec b/policycoreutils.spec
index bbb830c..3179685 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -91,11 +91,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/system-config-selinux
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/selinux-polgengui
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/security/console.apps/selinux-polgengui
 tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
-ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
+ln -sf /usr/share/system-config-selinux/polgengui.py %{buildroot}%{_bindir}/selinux-polgengui
 
 desktop-file-install	--vendor fedora \
 			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -116,7 +115,7 @@ Requires: audit-libs-python >=  %{libauditver}
 Requires: /usr/bin/make
 Requires(pre): python >= 2.6
 Obsoletes: policycoreutils < 2.0.61-2
-Requires: setools-libs-python
+Requires: setools-libs-python >= setools-3.3.7-6
 
 %description python
 The policycoreutils-python package contains the management tools use to manage an SELinux environment.
@@ -227,7 +226,6 @@ system-config-selinux is a utility for managing the SELinux environment
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
 %config(noreplace) %{_sysconfdir}/pam.d/selinux-polgengui
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
-%config(noreplace) %{_sysconfdir}/security/console.apps/selinux-polgengui
 
 %clean
 rm -rf %{buildroot}
@@ -314,6 +312,9 @@ fi
 exit 0
 
 %changelog
+* Thu Aug 5 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-13
+- Remove requirement to run selinux-polgen as root
+
 * Thu Aug 5 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-12
 - Fix selinux-polgen