* Tue Nov 14 2006 Dan Walsh <dwalsh@redhat.com> 1.33.1-3

- Update to upstream
	* Merged newrole patch set from Michael Thompson.
- Add policycoreutils-gui

.cvsignore

@@ -115,3 +115,4 @@ policycoreutils-1.30.28.tgz
 policycoreutils-1.30.29.tgz
 policycoreutils-1.30.30.tgz
 policycoreutils-1.32.tgz
+policycoreutils-1.33.1.tgz

policycoreutils.spec

@@ -4,11 +4,15 @@
 %define libselinuxver 1.30.29-2
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.32
+Version: 1.33.1
-Release: 3
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Source1: system-config-selinux.png
+Source2: system-config-selinux.desktop
+Source3: system-config-selinux.pam
+Source4: system-config-selinux.console
 Patch: policycoreutils-rhat.patch
 Patch1: policycoreutils-po.patch
 
@@ -52,16 +56,23 @@ mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_mandir}/man8
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
+
 make LOG_AUDIT_PRIV=y  DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/system-config-selinux/
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
+ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 
+desktop-file-install --vendor fedora                            \
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --add-category X-Fedora                                 \
+	%{SOURCE2}
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
-
 %package newrole
 Summary: newrole application for RBAC/MLS 
-Group: Development/Libraries
+Group: System Environment/Base
 Requires: policycoreutils = %{version}-%{release} 
 
 %description newrole
@@ -72,6 +83,29 @@ or level of a logged in user.
 %{_bindir}/newrole
 %{_mandir}/man1/newrole.1.gz
 
+%package gui
+Summary: SELinux configuration GUI
+Group: System Environment/Base
+Requires: policycoreutils = %{version}-%{release} 
+Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas 
+Requires: usermode, rhpl
+Requires: python >= 2.4
+BuildRequires: desktop-file-utils
+Obsoletes: system-config-selinux
+
+%description gui
+system-config-selinux is a utility for managing the SELinux environment
+
+%files gui
+%{_bindir}/system-config-selinux
+%{_datadir}/applications/fedora-system-config-selinux.desktop
+%{_datadir}/system-config-selinux/
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
+
+%clean
+rm -rf %{buildroot}
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 /sbin/restorecon
@@ -122,6 +156,7 @@ or level of a logged in user.
 %attr(755,root,root) /etc/rc.d/init.d/restorecond
 %config(noreplace) /etc/selinux/restorecond.conf
 
+
 %preun
 if [ $1 -eq 0 ]; then
    /sbin/service restorecond stop > /dev/null 2>&1
@@ -133,6 +168,11 @@ fi
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Tue Nov 14 2006 Dan Walsh <dwalsh@redhat.com> 1.33.1-3
+- Update to upstream
+	* Merged newrole patch set from Michael Thompson.
+- Add policycoreutils-gui
+
 * Thu Nov 9 2006 Dan Walsh <dwalsh@redhat.com> 1.32-3
 - No longer requires rhpl
 

sources

@@ -1 +1 @@
-ebc0633aab2735c27a78e6c3f478143e  policycoreutils-1.32.tgz
+f1f63d519c9d1c80999790999a997020  policycoreutils-1.33.1.tgz

system-config-selinux.console

@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/usr/share/system-config-selinux/system-config-selinux.py
+SESSION=true

system-config-selinux.desktop

@@ -0,0 +1,12 @@
+[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
+Exec=/usr/bin/system-config-selinux
+Type=Application
+Terminal=false
+Encoding=UTF-8
+Categories=Application;SystemSetup;X-Red-Hat-Base;
+X-Desktop-File-Install-Version=0.2

system-config-selinux.pam

@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       sufficient   pam_timestamp.so
+auth       include	system-auth
+session	   required	pam_permit.so
+session    optional	pam_xauth.so
+session    optional     pam_timestamp.so
+account    required	pam_permit.so