forked from pool/numad
Accepting request 460720 from hardware
Submit fixes that are prepared in the devel prj.. there they don't serve anybody OBS-URL: https://build.opensuse.org/request/show/460720 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/numad?expand=0&rev=4
This commit is contained in:
commit
2ab1e78b57
@ -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
|
Wed May 22 23:55:17 UTC 2013 - mgorman@suse.com
|
||||||
|
|
||||||
|
18
numad.spec
18
numad.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package numad
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -28,10 +28,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Patch1: mainline-sysfs-paths.patch
|
Patch1: mainline-sysfs-paths.patch
|
||||||
Patch2: numad-sbindir.patch
|
Patch2: numad-sbindir.patch
|
||||||
Patch3: numad-opensuse-init.patch
|
Patch3: numad-opensuse-init.patch
|
||||||
Patch4: numad-versioning.patch
|
Patch4: numad-versioning.patch
|
||||||
Patch5: numad-rpm-opt-flags.patch
|
Patch5: numad-rpm-opt-flags.patch
|
||||||
Patch6: numad-opensuse-systemd.patch
|
Patch6: numad-opensuse-systemd.patch
|
||||||
Patch7: numad-systemd-simple-type.patch
|
Patch7: numad-systemd-simple-type.patch
|
||||||
|
|
||||||
%if 0%{?suse_version} > 1140
|
%if 0%{?suse_version} > 1140
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
@ -99,9 +99,10 @@ ln -sf ../../etc/init.d/numad $RPM_BUILD_ROOT/usr/sbin/rcnumad
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%stop_on_removal numad
|
|
||||||
%if 0%{?has_systemd}
|
%if 0%{?has_systemd}
|
||||||
%service_del_preun numad.service
|
%service_del_preun numad.service
|
||||||
|
%else
|
||||||
|
%stop_on_removal numad
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
@ -110,10 +111,11 @@ ln -sf ../../etc/init.d/numad $RPM_BUILD_ROOT/usr/sbin/rcnumad
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%restart_on_update numad
|
|
||||||
%insserv_cleanup
|
|
||||||
%if 0%{?has_systemd}
|
%if 0%{?has_systemd}
|
||||||
%service_del_postun numad.service
|
%service_del_postun numad.service
|
||||||
|
%else
|
||||||
|
%restart_on_update numad
|
||||||
|
%insserv_cleanup
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user