Accepting request 40309 from hardware

Copy from hardware/powerman based on submit request 40309 from user coolo

OBS-URL: https://build.opensuse.org/request/show/40309
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/powerman?expand=0&rev=5
This commit is contained in:
OBS User autobuild 2010-05-19 07:21:49 +00:00 committed by Git OBS Bridge
commit 3443006576
3 changed files with 35 additions and 3 deletions

24
powerman-piddir.patch Normal file
View File

@ -0,0 +1,24 @@
--- scripts/powerman.init.in
+++ scripts/powerman.init.in
@@ -34,7 +34,8 @@
DAEMON="$sbindir/powermand"
#DAEMON_ARGS=
CONFIG=$sysconfdir/powerman/powerman.conf
-PIDFILE="$localstatedir/run/powerman/powermand.pid"
+PIDDIR="$localstatedir/run/powerman"
+PIDFILE="$PIDDIR/powermand.pid"
#NICE=
USER=@RUN_AS_USER@
#SIGHUP_RELOAD=
@@ -53,7 +54,10 @@
SCRIPT_NAME="`basename \"$0\" .init | sed 's/^[SK][0-9][0-9]*//'`"
SIGTERM_TIMEOUT="3"
STATUS=0
-
+ if [ ! -d "$PIDDIR" ] ; then
+ mkdir "$PIDDIR"
+ chown $USER $PIDDIR
+ fi
# Read configuration defaults to override variables:
# $DAEMON_ARGS, $CONFIG, $PIDFILE, $USER, $NICE, $SIGHUP_RELOAD
##

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 19 02:38:24 CEST 2010 - ro@suse.de
- keep /var/run/powerman only as ghost in filelist
and create it in initscript if missing
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 14 15:00:56 CEST 2009 - sbrabec@suse.cz Fri Aug 14 15:00:56 CEST 2009 - sbrabec@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package powerman (Version 2.3.5) # spec file for package powerman (Version 2.3.5)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products 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
@ -20,11 +20,12 @@
Name: powerman Name: powerman
Version: 2.3.5 Version: 2.3.5
Release: 2 Release: 3
License: GPL License: GPL
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Url: http://powerman.sourceforge.net/ Url: http://powerman.sourceforge.net/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch0: powerman-piddir.patch
Summary: Centralized Power Control for Clusters Summary: Centralized Power Control for Clusters
BuildRequires: curl-devel ncurses-devel tcpd-devel BuildRequires: curl-devel ncurses-devel tcpd-devel
# For directory ownership: # For directory ownership:
@ -81,6 +82,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0
%build %build
# --with-genders # --with-genders
@ -117,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog ChangeLog-1.0 DISCLAIMER COPYING NEWS README TODO %doc AUTHORS ChangeLog ChangeLog-1.0 DISCLAIMER COPYING NEWS README TODO
%{_bindir}/* %{_bindir}/*
%{_libdir}/stonith/plugins/external/powerman %{_libdir}/stonith/plugins/external/powerman
%dir %attr(0755,daemon,root) %config %{_localstatedir}/run/powerman %dir %attr(0755,daemon,root) %ghost %{_localstatedir}/run/powerman
%doc %{_mandir}/man?/*.* %doc %{_mandir}/man?/*.*
%exclude %doc %{_mandir}/man3/*.* %exclude %doc %{_mandir}/man3/*.*
%{_sbindir}/* %{_sbindir}/*