[selinux-policy] Revert "Upstream change:"

[Miroslav Grepl]

commit 1a1e004154b42f89ef2fa989330972566c21b610
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Mon Jan 7 14:54:15 2013 +0100

    Revert "Upstream change:"
    
    This reverts commit 7316889d21a0baedca980e02de37b3dbe24d73be.

 modules-targeted-contrib.conf |    2 +-
 selinux-policy.spec           |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index d0a4ede..f5fc462 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -732,7 +732,7 @@ glance = module
 #  
 #  policy for glusterd service
 #
-glusterfs =  module
+glusterd =  module
 
 # Layer: services
 # Module: gnomeclock
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 629e740..7bfa616 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -252,9 +252,9 @@ fi;
 . %{_sysconfdir}/selinux/config; \
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    rm /etc/selinux/%2/.rebuild; \
-   (cd /etc/selinux/%2/modules/active/modules; rm -f ctdbd.pp fcoemon.pp glusterd.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
+   (cd /etc/selinux/%2/modules/active/modules; rm -f ctdbd.pp fcoemon.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
    if [ %1 -ne 1 ]; then \
-	/usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon glusterd 2>/dev/null; \
+	/usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon 2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -n -s %2; \
 else \