--- rpms/e-smith-base/sme9/e-smith-base.spec 2015/06/25 14:55:52 1.91 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2015/06/25 15:15:03 1.92 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.90 2015/06/11 20:13:30 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.91 2015/06/25 14:55:52 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 21 +%define release 22 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -73,6 +73,9 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu Jun 25 2015 Daniel Berteaud 5.6.0-22.sme +- Fix including /etc/selinux directory [SME: 8954] + * Thu Jun 25 2015 Daniel Berteaud 5.6.0-21.sme - Add templates for /etc/selinux/config [SME: 8954] @@ -1787,8 +1790,6 @@ e-smith server and gateway software - ba %build -mkdir -p $RPM_BUILD_ROOT/etc/selinux - LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ -type f | grep -v CVS) @@ -1806,6 +1807,7 @@ perl createlinks %install rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/selinux (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \