[ocp] correct fcontext regexps and restorecon glob

Charles R. Anderson cra at fedoraproject.org
Sat Jun 4 16:18:08 UTC 2011


commit cbcef93afaded24e71cc5530ed217a922d4d5ab0
Author: Chuck Anderson <cra at wpi.edu>
Date:   Sat Jun 4 12:17:52 2011 -0400

    correct fcontext regexps and restorecon glob

 ocp.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ocp.spec b/ocp.spec
index e7231b7..6556f45 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,6 +1,6 @@
 #define snapshot 20100401
 %define version 0.1.20
-%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:3}%{?dist}
+%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:4}%{?dist}
 
 Name: ocp
 Version: %{version}
@@ -146,11 +146,11 @@ rm -rf %{buildroot}
 /sbin/install-info %{_infodir}/ocp.info.gz %{_infodir}/dir || :
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 %ifarch %{ix86}
-semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devmix\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devmixf\.so' 2>/dev/null || :
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
 semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
 semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-restorecon -R %{_libdir}/ocp-.* || :
+restorecon -R %{_libdir}/ocp-* || :
 %endif
 
 
@@ -165,6 +165,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 
 
 %changelog
+* Wed Jun 03 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-4
+- correct fcontext regexps and restorecon glob
+
 * Wed Jun 03 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-3
 - fix parsing timidity.cfg
 - set SELinux file context textrel_shlib_t on libraries which contain non-PIC


More information about the scm-commits mailing list