From 08bbf91b689a470356550d91b1c7a8caca837230 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Thu, 2 Jan 2014 13:25:47 -0500 Subject: [PATCH] Eliminate requirement on service script. --- setroubleshoot.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 0bcf35e..0812a0b 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,7 +1,7 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot Version: 3.2.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot @@ -107,9 +107,6 @@ Requires: dbus Requires: dbus-python Requires: polkit -Requires(post): /sbin/service -Requires(preun): /sbin/service - %description server Provides tools to help diagnose SELinux problems. When AVC messages are generated an alert can be generated that will give information @@ -123,9 +120,8 @@ to user preference. The same tools can be run on existing log files. %systemd_postun_with_restart auditd.service %triggerun server -- %{name}-server < 2.1.1 -/sbin/service %{name} stop >/dev/null 2>&1 || : -chkconfig --del %{name} || : - +/usr/bin/systemctl --no-reload disable %{name} >/dev/null 2>&1 || : +/usr/bin/systemctl stop %{name} >/dev/null 2>&1 || : %clean rm -rf %{buildroot} @@ -174,6 +170,9 @@ rm -rf %{buildroot} %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service %changelog +* Thu Jan 2 2014 Dan Walsh - 3.2.15-2 +- Eliminate requirement on service script. + * Tue Dec 3 2013 Dan Walsh - 3.2.15-1 - Update Lanquages - Use setup.py in Makefile for setroubleshoot dir