- use /etc/selinux/targeted/contexts/files/file_contexts for now.

- disable file contexts into package metadata during build.

CVS patchset: 7280
CVS date: 2004/05/30 17:52:57

diff --git a/macros.in b/macros.in
index 8a1737d..a4f4325 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.149 2004/04/08 00:12:01 jbj Exp $
+# $Id: macros.in,v 1.150 2004/05/30 17:52:57 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -327,25 +327,28 @@ package or when debugging this package.\
 # Filter GLIBC_PRIVATE Provides: and Requires:
 %_filter_GLIBC_PRIVATE                 0
 
-# Path to selinux source policy file context patterns.
-%__file_context_path /etc/security/selinux/file_contexts
+# Desired selinux policy tree
+%__policy_tree targeted
+
+# Path to selinux file context patterns.
+%__file_context_path /etc/selinux/%{__policy_tree}/contexts/files/file_contexts
 
 #
-# Path to selinux src policy file context patterns used to add
+# Path to selinux file context patterns used to add
 # RPMTAG_FILECONTEXTS to packages when building.
 #
 # Undefined, missing or %{nil} will disable.
-%_build_file_context_path      %{__file_context_path}
+%_build_file_context_path      %{nil}
 
 #
-# Path to selinux src policy file context patterns used to set
+# Path to selinux file context patterns used to set
 # (or override package content) file contexts when installing.
 #
 # Undefined, missing or %{nil} will use package content (if available).
 %_install_file_context_path    %{__file_context_path}
 
 #
-# Path to selinux src policy file context patterns used to verify
+# Path to selinux file context patterns used to verify
 # file contexts on file system.
 #
 # Undefined, missing or %{nil} will use package content (if available).