From 3ed1f41ff24e7afd1228aef43254d247cf89b5559d63986f98086ef8df74f969 Mon Sep 17 00:00:00 2001
From: Philipp Seiler
Date: Wed, 25 Apr 2018 23:42:02 +0000
Subject: [PATCH] Accepting request 601041 from home:eeich:branches:hardware
- For SLE-12 set user/group to daemon/root for backward
compatibility.
- Minor specfile cosmetics:
* Simplified the entry for %{_sysconfdir}/powerman.
OBS-URL: https://build.opensuse.org/request/show/601041
OBS-URL: https://build.opensuse.org/package/show/hardware/powerman?expand=0&rev=39
---
powerman.changes | 12 ++++++++++++
powerman.spec | 11 +++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/powerman.changes b/powerman.changes
index 4aba77e..fd20499 100644
--- a/powerman.changes
+++ b/powerman.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Apr 25 09:48:37 UTC 2018 - eich@suse.com
+
+- For SLE-12 set user/group to daemon/root for backward
+ compatibility.
+
+-------------------------------------------------------------------
+Tue Aug 15 13:22:50 UTC 2017 - eich@suse.com
+
+- Minor specfile cosmetics:
+ * Simplified the entry for %{_sysconfdir}/powerman.
+
-------------------------------------------------------------------
Fri Aug 11 19:47:51 UTC 2017 - eich@suse.com
diff --git a/powerman.spec b/powerman.spec
index 62e1335..489d30c 100644
--- a/powerman.spec
+++ b/powerman.spec
@@ -1,7 +1,7 @@
#
# spec file for package powerman
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -21,8 +21,13 @@
%define _with_tcp_wrappers 1
%undefine _with_genders
+%if 0%{?suse_version} >= 1500
%define powerman_g %name
%define powerman_u %name
+%else
+%define powerman_g daemon
+%define powerman_u root
+%endif
Name: powerman
Version: 2.3.24
@@ -127,10 +132,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/powerman.conf
%{_mandir}/man?/*.*
%exclude %{_mandir}/man3/*.*
%{_sbindir}/*
-%dir %{_sysconfdir}/powerman
+%config %{_sysconfdir}/powerman/
%attr(0644,root,root) %{_unitdir}/%{name}.service
-%config %{_sysconfdir}/powerman/powerman.conf
-%config %{_sysconfdir}/powerman/*.dev
%{_tmpfilesdir}/powerman.conf
%files devel