From ade486af7261de34f480415c0c90cae7791952f1 Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Mon, 27 Jun 2011 18:02:16 +0200
Subject: [PATCH] Update to upstream

---
 modules-mls.conf      | 2 +-
 modules-targeted.conf | 2 +-
 selinux-policy.spec   | 9 ++++++---
 sources               | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules-mls.conf b/modules-mls.conf
index 3b449673..361343d9 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -1216,7 +1216,7 @@ qmail = module
 #
 # Policy for qpidd
 # 
-qpidd = module
+qpid = module
 
 # Layer: admin
 # Module: quota
diff --git a/modules-targeted.conf b/modules-targeted.conf
index a2465e35..ff589502 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1368,7 +1368,7 @@ qmail = module
 #
 # Policy for qpidd
 # 
-qpidd = module
+qpid = module
 
 # Layer: admin
 # Module: quota
diff --git a/selinux-policy.spec b/selinux-policy.spec
index e3ae4913..0675adfe 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.26-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.9.16
-Release: 30%{?dist}
+Version: 3.10.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -199,7 +199,7 @@ md5=`md5sum /etc/selinux/%2/modules/active/policy.kern | cut -d ' ' -f 1`; \
 checkmd5=`cat /etc/selinux/%2/.policymd5`; \
 if [ "$md5" != "$checkmd5" ] ; then \
    if [ %1 -ne 1 ]; then \
-      	 semodule -n -s %2 -r moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger 2>/dev/null; \
+      	 semodule -n -s %2 -r moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
    fi \
    semodule -B -s %2; \
 else \
@@ -449,6 +449,9 @@ SELinux Reference policy mls base module.
 %endif
 
 %changelog
+* Mon Jun 27 2011 Miroslav Grepl <mgrepl@redhat.com> 3.10.0-1
+- Update to upstream
+
 * Mon Jun 27 2011 Miroslav Grepl <mgrepl@redhat.com> 3.9.16-30
 - More fixes
   * http://git.fedorahosted.org/git/?p=selinux-policy.git
diff --git a/sources b/sources
index e45ca023..f599a54e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 409b40c8102b1617681ba17c31032e66  config.tgz
-f5e2a024693e5f5fb65bb2c1cd8256cd  serefpolicy-3.9.16.tgz
+ba1811dc492f14b79039e5a0df568917  serefpolicy-3.10.0.tgz