[selinux-policy: 3/4] apply merge

[Daniel J Walsh]

commit d0597c1c15a11055295524042b79a1fbf95d4172
Merge: 5253d49 183e54f
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Jun 8 12:17:39 2011 -0400

    apply merge

 policy-F16.patch    |  203 +++++++++++++++++++++++++++++++++++---------------
 selinux-policy.spec |   11 ++-
 2 files changed, 151 insertions(+), 63 deletions(-)
---
diff --cc selinux-policy.spec
index bcf6ec1,52bb038..d8fd4ca
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@@ -18,7 -21,7 +18,7 @@@
  Summary: SELinux policy configuration
  Name: selinux-policy
  Version: 3.9.16
- Release: 26.1%{?dist}
 -Release: 28%{?dist}
++Release: 28.1%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  Source: serefpolicy-%{version}.tgz
@@@ -432,9 -472,13 +432,16 @@@ exit 
  %endif
  
  %changelog
- * Tue Jun 7 2011 Dan Walsh <dwalsh at redhat.com> 3.9.16-26.1
++* Wed Jun 8 2011 Dan Walsh <dwalsh at redhat.com> 3.9.16-28.1
 +- Add policy.26 to the payload
 +
+ * Wed Jun 8 2011 Miroslav Grepl <mgrepl at redhat.com> 3.9.16-27
+ - Fixes for zabbix
+ - init script needs to be able to manage sanlock_var_run_...
+ - Allow sandlock and wdmd to create /var/run directories... 
+ - mixclip.so has been compiled correctly
+ - Fix passenger policy module name
+ 
  * Tue Jun 7 2011 Miroslav Grepl <mgrepl at redhat.com> 3.9.16-26
  - Add mailscanner policy from dgrift
  - Allow chrome to optionally be transitioned to