[selinux-policy] Revert "Upstream change:"

[Miroslav Grepl]

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

    Revert "Upstream change:"
    
    This reverts commit 098e5a096859212afe03a1b494ad7dec21a4bb3e.

 modules-targeted-contrib.conf |    6 +++---
 selinux-policy.spec           |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index f5fc462..50d128b 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -637,11 +637,11 @@ exim = module
 fail2ban = module
 
 # Layer: services
-# Module: fcoe
+# Module: fcoemon
 #
-# fcoe
+# fcoemon
 #
-fcoe = module
+fcoemon = module
 
 # Layer: services
 # Module: fetchmail
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 7bfa616..5030dca 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 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 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 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 2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -n -s %2; \
 else \