diff --git a/mrtg.spec b/mrtg.spec index 5658a2f..014d72b 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -80,10 +80,10 @@ Custom SELinux policy module %prep %setup -q -%patch0 -p1 -b .lib64 -%patch1 -p1 -b .socket6 -%patch2 -p1 -b .ifhighspeed -%patch3 -p1 -b .c99 +%patch -P 0 -p1 -b .lib64 +%patch -P 1 -p1 -b .socket6 +%patch -P 2 -p1 -b .ifhighspeed +%patch -P 3 -p1 -b .c99 for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -151,7 +151,6 @@ install -D -p -m 0644 selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/d %post install -d -m 0755 -o root -g root /var/lock/mrtg -restorecon /var/lock/mrtg %systemd_post mrtg.service %preun @@ -176,7 +175,7 @@ fi if [ "$1" -le "1" ]; then # First install # the service needs to be restarted for the custom label to be applied - %systemd_postun_with_restart mrtg.service + %systemd_postun_with_restart mrtg.service &> /dev/null || : fi %postun selinux @@ -209,10 +208,15 @@ fi %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* %{_datadir}/selinux/devel/include/distributed/%{modulename}.if -%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %endif %changelog +* Wed Jan 15 2025 Vitezslav Crhonek - 2.17.10-11 +- Remove redundand restorecon call, redirect safe to ignore output + to /dev/null, mark module directory to avoid rpm verification + Resolves: RHEL-67894 + * Tue Oct 29 2024 Troy Dawson - 2.17.10-10 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018