[selinux-policy/f15/master] Update modules-mls to allow minimal base package

[Daniel J Walsh]

commit fae927b946e31a59c831e10acca7a40a04a87fd5
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Mar 2 16:19:43 2011 -0500

    Update modules-mls to allow minimal base package

 modules-mls.conf    |    6 +++---
 selinux-policy.spec |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/modules-mls.conf b/modules-mls.conf
index 38e3ff0..cc8dda3 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -115,7 +115,7 @@ apm = module
 #
 # Defines attributs and interfaces for all user applications
 # 
-application = base
+application = module
 
 # Layer: services
 # Module: arpwatch
@@ -316,7 +316,7 @@ consoletype = module
 # Core policy for shells, and generic programs
 # in /bin, /sbin, /usr/bin, and /usr/sbin.
 # 
-corecommands = module
+corecommands = base
 
 # Layer: kernel
 # Module: corenetwork
@@ -1403,7 +1403,7 @@ selinuxutil = module
 #
 # Policy for setrans
 # 
-setrans = base
+setrans = module
 
 # Layer: services
 # Module: setroubleshoot
diff --git a/selinux-policy.spec b/selinux-policy.spec
index c34aa10..c725318 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -26,7 +26,6 @@ License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-F15.patch
-patch2: policy-test.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -205,7 +204,6 @@ Based off of reference policy: Checked out revision  2.20091117
 %prep 
 %setup -n serefpolicy-%{version} -q
 %patch -p1
-%patch2 -p1
 
 %install
 mkdir selinux_config
@@ -384,7 +382,8 @@ SELinux Reference policy minimum base module.
 %saveFileContext minimum
 
 %post minimum
-packages="execmem.pp.bz2 unconfined.pp.bz2 unconfineduser.pp.bz2"
+packages="execmem.pp.bz2 unconfined.pp.bz2 unconfineduser.pp.bz2 application.pp.bz2 userdomain.pp.bz2 authlogin.pp.bz2 logging.pp.bz2 selinuxutil.pp.bz2 init.pp.bz2 systemd.pp.bz2 sysnetwork.pp.bz2 miscfiles.pp.bz2 libraries.pp.bz2 modutils.pp.bz2 sysadm.pp.bz2 locallogin.pp.bz2 dbus.pp.bz2 rpm.pp.bz2 mount.pp.bz2 fstools.pp.bz2 usermanage.pp.bz2 mta.pp.bz2"
+
 %loadpolicy minimum $packages
 if [ $1 -eq 1 ]; then
 semanage -S minimum -i - << __eof