[selinux-policy/f16] Remove tzdata policy in modules-* and add fix to spec file

[Miroslav Grepl]

commit e0e140bcee25c593c7df05a531ed26c6e36db6d1
Author: Miroslav <mgrepl at redhat.com>
Date:   Thu Oct 20 17:51:15 2011 +0200

    Remove tzdata policy in modules-* and add fix to spec file

 modules-mls.conf      |    7 -------
 modules-targeted.conf |    7 -------
 selinux-policy.spec   |    5 ++++-
 3 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/modules-mls.conf b/modules-mls.conf
index 90bc08a..90524bf 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -1570,13 +1570,6 @@ wine = module
 # 
 wireshark = module
 
-# Layer: admin
-# Module: tzdata
-#
-# Policy for tzdata-update
-# 
-tzdata = module
-
 # Layer: apps
 # Module: userhelper
 #
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 2645cf6..bb47a0f 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1894,13 +1894,6 @@ wireshark = module
 # 
 telepathy = module
 
-# Layer: admin
-# Module: tzdata
-#
-# Policy for tzdata-update
-# 
-tzdata = module
-
 # Layer: apps
 # Module: userhelper
 #
diff --git a/selinux-policy.spec b/selinux-policy.spec
index d53a10c..d75c356 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -211,7 +211,7 @@ fi;
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    rm /etc/selinux/%2/.rebuild; \
    if [ %1 -ne 1 ]; then \
-	/usr/sbin/semodule -n -s %2 -r moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
+	/usr/sbin/semodule -n -s %2 -r tzdata hal moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -s %2; \
 else \
@@ -466,6 +466,9 @@ SELinux Reference policy mls base module.
 %endif
 
 %changelog
+* Thu Oct 20 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-45
+- Remove tzdata policy
+
 * Thu Oct 20 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-44
 - Add labeling for udev
 - Add cloudform policy