From 0d3bf34c03802a66b9be8113ce58620b285a6318 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 28 Apr 2021 12:09:52 +0200 Subject: [PATCH] simplify selinux policy path for ci tests --- selinux_smartmon.fc => smartmon.fc | 0 selinux_smartmon.if => smartmon.if | 0 selinux_smartmon.te => smartmon.te | 0 smartmontools.spec | 17 ++++++++--------- 4 files changed, 8 insertions(+), 9 deletions(-) rename selinux_smartmon.fc => smartmon.fc (100%) rename selinux_smartmon.if => smartmon.if (100%) rename selinux_smartmon.te => smartmon.te (100%) diff --git a/selinux_smartmon.fc b/smartmon.fc similarity index 100% rename from selinux_smartmon.fc rename to smartmon.fc diff --git a/selinux_smartmon.if b/smartmon.if similarity index 100% rename from selinux_smartmon.if rename to smartmon.if diff --git a/selinux_smartmon.te b/smartmon.te similarity index 100% rename from selinux_smartmon.te rename to smartmon.te diff --git a/smartmontools.spec b/smartmontools.spec index af5895d..dfb3e24 100644 --- a/smartmontools.spec +++ b/smartmontools.spec @@ -7,7 +7,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 7.2 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: GPLv2+ URL: http://smartmontools.sourceforge.net/ @@ -17,9 +17,9 @@ Source4: smartdnotify #semi-automatic update of drivedb.h %global UrlSource5 https://sourceforge.net/p/smartmontools/code/HEAD/tree/trunk/smartmontools/drivedb.h?format=raw Source5: drivedb.h -Source6: selinux_%{modulename}.te -Source7: selinux_%{modulename}.if -Source8: selinux_%{modulename}.fc +Source6: %{modulename}.te +Source7: %{modulename}.if +Source8: %{modulename}.fc #fedora/rhel specific Patch1: smartmontools-5.38-defaultconf.patch @@ -61,11 +61,7 @@ Custom SELinux policy module for smartmontools cp %{SOURCE5} . %if 0%{?with_selinux} mkdir selinux -for srcf in %{SOURCE6} %{SOURCE7} %{SOURCE8} -do - dstf=${srcf##*/selinux_} - cp -p $srcf $dstf -done +cp -p %{SOURCE6} %{SOURCE7} %{SOURCE8} selinux/ %endif %build @@ -158,6 +154,9 @@ fi %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %changelog +* Wed Apr 28 2021 Michal Hlavinka - 1:7.2-6 +- simplify selinux policy path for ci tests + * Mon Apr 19 2021 Michal Hlavinka - 1:7.2-5 - add selinux sub-package