diff --git a/selinux-policy.changes b/selinux-policy.changes index 33ee8eb..5ceb4ff 100644 --- a/selinux-policy.changes +++ b/selinux-policy.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Jun 26 12:19:07 CEST 2009 - thomas@novell.com -- added config file for /etc/selinux/ +- added config file for /etc/selinux/ ------------------------------------------------------------------- Wed Jan 14 14:20:23 CET 2009 - prusnak@suse.cz diff --git a/selinux-policy.spec b/selinux-policy.spec index 54c4191..fefbd3b 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -19,20 +19,21 @@ License: GPL v2 Group: System/Base Summary: SELinux policies Source: refpolicy-%{version}.tar.bz2 -Source1: config +Source1: config Patch0: %{name}-build_conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: checkpolicy policycoreutils libsepol-devel python python-xml m4 BuildArch: noarch +# default is refpolicy-standard (mentioned in config) +Requires: selinux-policy-refpolicy-standard %description - -SELinux policies +SELinux policy %package refpolicy-standard Group: System/Base Summary: SELinux policy - Tresys Standard Refpolicy -Provides: selinux-policy +Requires: selinux-policy %description refpolicy-standard @@ -41,7 +42,7 @@ SELinux policy - based on reference policy from Tresys - standard %package refpolicy-mcs Group: System/Base Summary: SELinux policy - Tresys MCS Refpolicy -Provides: selinux-policy +Requires: selinux-policy %description refpolicy-mcs @@ -50,7 +51,7 @@ SELinux policy - based on reference policy from Tresys - mcs %package refpolicy-mls Group: System/Base Summary: SELinux policy - Tresys MLS Refpolicy -Provides: selinux-policy +Requires: selinux-policy %description refpolicy-mls @@ -79,36 +80,31 @@ for i in standard mcs mls; do cd .. done install -m 600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/ -#mkdir $RPM_BUILD_ROOT/selinux %clean rm -rf $RPM_BUILD_ROOT +%files +%defattr(-,root,root) +%dir %{_sysconfdir}/selinux +%{_sysconfdir}/selinux/config + %files refpolicy-standard %defattr(-,root,root) %doc refpolicy-standard/COPYING refpolicy-standard/Changelog refpolicy-standard/README -%dir %{_sysconfdir}/selinux %dir %{_sysconfdir}/selinux/refpolicy-standard -#%dir /selinux -%{_sysconfdir}/selinux/config %{_sysconfdir}/selinux/refpolicy-standard/* %files refpolicy-mcs %defattr(-,root,root) %doc refpolicy-mcs/COPYING refpolicy-mcs/Changelog refpolicy-mcs/README -%dir %{_sysconfdir}/selinux %dir %{_sysconfdir}/selinux/refpolicy-mcs -#%dir /selinux -%{_sysconfdir}/selinux/config %{_sysconfdir}/selinux/refpolicy-mcs/* %files refpolicy-mls %defattr(-,root,root) %doc refpolicy-mls/COPYING refpolicy-mls/Changelog refpolicy-mls/README -%dir %{_sysconfdir}/selinux %dir %{_sysconfdir}/selinux/refpolicy-mls -#%dir /selinux -%{_sysconfdir}/selinux/config %{_sysconfdir}/selinux/refpolicy-mls/* %changelog