From 1aae95c3b1bf210dcd44aac41815740033f75dc45c36f769f3db36d026ce60e5 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Thu, 23 Feb 2017 10:17:05 +0000 Subject: [PATCH] Accepting request 459168 from home:kukuk:branches:hardware - Don't call insserv if we use systemd OBS-URL: https://build.opensuse.org/request/show/459168 OBS-URL: https://build.opensuse.org/package/show/hardware/numad?expand=0&rev=3 --- numad.changes | 5 +++++ numad.spec | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/numad.changes b/numad.changes index c250e97..2ede3ca 100644 --- a/numad.changes +++ b/numad.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 20 09:52:57 CET 2017 - kukuk@suse.de + +- Don't call insserv if we use systemd + ------------------------------------------------------------------- Wed May 22 23:55:17 UTC 2013 - mgorman@suse.com diff --git a/numad.spec b/numad.spec index d110829..9550b04 100644 --- a/numad.spec +++ b/numad.spec @@ -1,7 +1,7 @@ # # spec file for package numad # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,10 +28,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch1: mainline-sysfs-paths.patch Patch2: numad-sbindir.patch Patch3: numad-opensuse-init.patch -Patch4: numad-versioning.patch -Patch5: numad-rpm-opt-flags.patch -Patch6: numad-opensuse-systemd.patch -Patch7: numad-systemd-simple-type.patch +Patch4: numad-versioning.patch +Patch5: numad-rpm-opt-flags.patch +Patch6: numad-opensuse-systemd.patch +Patch7: numad-systemd-simple-type.patch %if 0%{?suse_version} > 1140 BuildRequires: systemd @@ -99,9 +99,10 @@ ln -sf ../../etc/init.d/numad $RPM_BUILD_ROOT/usr/sbin/rcnumad %endif %preun -%stop_on_removal numad %if 0%{?has_systemd} %service_del_preun numad.service +%else +%stop_on_removal numad %endif %post @@ -110,10 +111,11 @@ ln -sf ../../etc/init.d/numad $RPM_BUILD_ROOT/usr/sbin/rcnumad %endif %postun -%restart_on_update numad -%insserv_cleanup %if 0%{?has_systemd} %service_del_postun numad.service +%else +%restart_on_update numad +%insserv_cleanup %endif %changelog