From 2d2118eecb9a86b9cd7e1d50b6e8d823d109af51bd339c9b40096b971ced1475 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 27 Sep 2011 18:36:59 +0000
Subject: [PATCH] Accepting request 85108 from home:fcrozat:systemd

- Use latest systemd RPM macros.

OBS-URL: https://build.opensuse.org/request/show/85108
OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=37
---
 acpid.changes | 5 +++++
 acpid.spec    | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acpid.changes b/acpid.changes
index 4d1299e..bdf19f4 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 26 16:20:40 UTC 2011 - fcrozat@suse.com
+
+- Use latest systemd RPM macros.
+
 -------------------------------------------------------------------
 Fri Sep 23 14:18:54 UTC 2011 - fcrozat@suse.com
 
diff --git a/acpid.spec b/acpid.spec
index 4d94cca..ef05e92 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -77,20 +77,15 @@ install -dm 755 %buildroot%_var/log
 touch %buildroot%_var/log/acpid
 
 %pre
-%service_migrate_to_systemd_pre acpid
+%service_add_pre acpid.service
 
 %post
 %{fillup_and_insserv -y -f acpid}
-%service_migrate_to_systemd_post acpid
-%service_add acpid.service
-if [ $FIRST_ARG -eq 1 ]; then
-  /bin/systemctl enable acpid.service 2> /dev/null || :
-fi
+%service_add_post acpid.service
 
 %postun
 %restart_on_update acpid
 %{insserv_cleanup}
-%service_migrate_to_systemd_postun acpid
 %service_del_postun acpid.service
 
 %preun