From 5aa371d9cca20e7b722c1e00e10b9f0f281defe4b7d853571589a2130d023c55 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 21 Nov 2013 09:46:50 +0000
Subject: [PATCH] Accepting request 207065 from
 home:posophe:branches:Base:System

Drop sysvinit dupport; acpid doesn't build for distributions which
  use sysvinit

OBS-URL: https://build.opensuse.org/request/show/207065
OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=65
---
 acpid.changes |  6 ++++++
 acpid.spec    | 14 ++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/acpid.changes b/acpid.changes
index f877102..90e0e9b 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct 19 15:06:50 UTC 2013 - p.drouand@gmail.com
+
+- Drop sysvinit dupport; acpid doesn't build for distributions which
+  use sysvinit
+
 -------------------------------------------------------------------
 Tue Aug 13 06:44:10 UTC 2013 - mchang@suse.com
 
diff --git a/acpid.spec b/acpid.spec
index fe8f623..1bd9381 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -24,7 +24,6 @@ License:        GPL-2.0+
 Group:          System/Daemons
 Url:            http://tedfelix.com/linux/acpid-netlink.html
 Source:         http://downloads.sourceforge.net/project/acpid2/%{name}-%{version}.tar.xz
-Source2:        rcacpid
 Source3:        README.SuSE
 Source5:        events.power_button
 Source6:        thinkpad_handler
@@ -38,8 +37,6 @@ Source11:       sleep_button
 Patch1:         acpid-makefile.patch
 BuildRequires:  systemd
 BuildRequires:  xz
-Requires(pre):  %fillup_prereq
-Requires(pre):  %insserv_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64 ia64
 %systemd_requires
@@ -56,7 +53,7 @@ Configure it in /etc/sysconfig/powermanagement.
 %setup -q
 %patch1
 
-cp %{SOURCE2} %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} .
+cp %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} .
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
@@ -65,13 +62,11 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
-install -Dm 744 rcacpid %{buildroot}%{_initddir}/acpid
 install -Dm 744 thinkpad_handler %{buildroot}%{_prefix}/lib/acpid/thinkpad_handler
-mkdir -p %{buildroot}%{_prefix}/sbin
-ln -sf ../../etc/init.d/acpid %{buildroot}%{_sbindir}/rcacpid
 install -Dm 644 events.thinkpad %{buildroot}%{_sysconfdir}/acpi/events/thinkpad
 mkdir -p %{buildroot}/%{_unitdir}
 install -m 644 %{SOURCE8} %{buildroot}/%{_unitdir}
+ln -sf ../../%{_unitdir}/acpid.service %{buildroot}%{_sbindir}/rcacpid
 
 # formerly installed, but no longer useful with systemd. Keep as documentation.
 cp -p events.power_button events.sleep_button power_button sleep_button samples/
@@ -85,16 +80,12 @@ touch %{buildroot}%{_localstatedir}/log/acpid
 %service_add_pre acpid.service
 
 %post
-%{fillup_and_insserv -y -f acpid}
 %service_add_post acpid.service
 
 %postun
-%restart_on_update acpid
-%{insserv_cleanup}
 %service_del_postun acpid.service
 
 %preun
-%stop_on_removal acpid
 %service_del_preun acpid.service
 
 %files
@@ -103,7 +94,6 @@ touch %{buildroot}%{_localstatedir}/log/acpid
 %dir %{_sysconfdir}/acpi/events
 %{_sysconfdir}/acpi/events/thinkpad
 %{_prefix}/lib/acpid
-%{_sysconfdir}/init.d/acpid
 %_unitdir/%{name}.service
 %{_sbindir}/rcacpid
 %{_sbindir}/acpid