[rubygem-openshift-origin-common/f18] update selinux issues

[tdawson]

commit b69a5c5c7bd533438bd206fd9d9f2c1b8370a57c
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Sep 24 16:23:20 2012 -0500

    update selinux issues

 rubygem-openshift-origin-common.spec |    8 +++++++-
 stickshift.fc                        |   10 ----------
 2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/rubygem-openshift-origin-common.spec b/rubygem-openshift-origin-common.spec
index 70f7cfa..31fd25f 100644
--- a/rubygem-openshift-origin-common.spec
+++ b/rubygem-openshift-origin-common.spec
@@ -18,7 +18,7 @@
 Summary:        Common library code for OpenShift subsystem
 Name:           rubygem-%{gem_name}
 Version:        0.13.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
@@ -84,6 +84,9 @@ cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 mkdir -p %{buildroot}/usr/share/selinux/packages/%{name}
 cd SELinux
 make -f %{_datadir}/selinux/devel/Makefile
+install -p -m 644 -D stickshift.fc %{buildroot}%{_datadir}/selinux/packages/%{name}/stickshift.fc
+install -p -m 644 -D stickshift.if %{buildroot}%{_datadir}/selinux/packages/%{name}/stickshift.if
+install -p -m 644 -D stickshift.te %{buildroot}%{_datadir}/selinux/packages/%{name}/stickshift.te
 install -p -m 644 -D stickshift.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/stickshift.pp
 make -f %{_datadir}/selinux/devel/Makefile clean
 cd -
@@ -126,6 +129,9 @@ fixfiles -R rubygem-openshift-origin-common restore
 fi
 
 %changelog
+* Mon Sep 24 2012 Troy Dawson <tdawson at redhat.com> 0.13.3-12
+- Removed extra selinux declarations (#860072)
+
 * Wed Aug 22 2012 Troy Dawson <tdawson at redhat.com> - 0.13.3-11
 - Fixed post scripts to fixfiles the right package
 
diff --git a/stickshift.fc b/stickshift.fc
index fcc9961..f6b4507 100644
--- a/stickshift.fc
+++ b/stickshift.fc
@@ -1,15 +1,5 @@
-/var/lib/stickshift(/.*)? gen_context(system_u:object_r:stickshift_file_t,s0)
-
-/var/lib/stickshift/.httpd.d(/.*)? gen_context(system_u:object_r:httpd_config_t,s0)
-
 /etc/httpd/conf.d/stickshift gen_context(system_u:object_r:httpd_config_t,s0)
-
 /usr/sbin/mcollectived		--	gen_context(system_u:object_r:mcollectived_exec_t,s0)
-
 /var/lock/ss-create	--	gen_context(system_u:object_r:mcollectived_lock_t,s0)
-
-/var/log/mcollective\.log	--	gen_context(system_u:object_r:mcollectived_log_t,s0)
-
 /var/run/mcollective\.pid	--	gen_context(system_u:object_r:mcollectived_var_run_t,s0)
-
 /var/log/stickshift/user_action\.log	--	gen_context(system_u:object_r:httpd_log_t,s0)