Ludwig Nussel 2014-08-20 08:50:55 +00:00 committed by Git OBS Bridge
commit 23561f5c71
5 changed files with 44 additions and 20 deletions

3
powerman-2.3.16.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ab2846d15a93917fe79190f7a7609c3c2e128c03d040edf365fbd4f80a985b2
size 615696

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8893d0d88bf798a512d714dcfca5dd377f8cf5426d1da6fbeb5b2593e204ef28
size 509062

View File

@ -1,24 +1,25 @@
--- scripts/powerman.in
+++ scripts/powerman.in
@@ -34,7 +34,8 @@
diff -rupN powerman-2.3.16.old/scripts/powerman.in powerman-2.3.16/scripts/powerman.in
--- powerman-2.3.16.old/scripts/powerman.in 2012-01-12 16:37:34.000000000 -0800
+++ powerman-2.3.16/scripts/powerman.in 2014-08-04 09:40:11.063544169 -0700
@@ -34,7 +34,8 @@ DESC="PowerMan"
DAEMON="$sbindir/powermand"
#DAEMON_ARGS=
CONFIG=$sysconfdir/powerman/powerman.conf
-PIDFILE="$localstatedir/run/powerman/powermand.pid"
+PIDDIR="$localstatedir/run/powerman"
+PIDDIR="/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]*//'`"
@@ -54,6 +55,11 @@ service_init ()
SIGTERM_TIMEOUT="3"
STATUS=0
-
+ if [ ! -d "$PIDDIR" ] ; then
+ mkdir "$PIDDIR"
+ chown $USER $PIDDIR
+ fi
+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,26 @@
-------------------------------------------------------------------
Mon Aug 4 16:54:41 UTC 2014 - sfalken@opensuse.org
- Updates in 2.3.16
* Fix duplicate node name (Issue 35)
Pulled in another hotlist fix (Mark Grondona)
* Fix powerman stonith OFF should verify plug state (chaos bz 1439)
- Updated powerman-pidfile.patch to reflect /run instead of /var/run
-------------------------------------------------------------------
Wed Jul 30 02:43:19 UTC 2014 - sfalken@opensuse.org
- Updated to 2.3.16
* Changed /var/run to /run in .spec to fix rpmlint check failures
Updated URL in .spec file
* Added:
powerman-2.3.16.tar.gz
* Removed:
powerman-2.3.9.tar.bz2
* Updated:
powerman.spec
-------------------------------------------------------------------
Thu Dec 8 13:04:25 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package powerman
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,10 +23,10 @@
%endif
Name: powerman
Version: 2.3.9
Version: 2.3.16
Release: 0
Url: http://powerman.sourceforge.net/
Source: %{name}-%{version}.tar.bz2
Url: http://code.google.com/p/powerman/
Source: %{name}-%{version}.tar.gz
Patch0: powerman-piddir.patch
Patch1: powerman-runlevel.patch
Summary: Centralized Power Control for Clusters
@ -65,7 +65,7 @@ A header file and static library for developing applications using PowerMan.
%prep
%setup -q
%patch0
%patch0 -p1
%patch1 -p1
%build
@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{?enable_heartbeat}
%{_libdir}/stonith/plugins/external/powerman
%endif
%dir %attr(0755,daemon,root) %ghost %{_localstatedir}/run/powerman
%dir %attr(0755,daemon,root) %ghost /run/powerman
%doc %{_mandir}/man?/*.*
%exclude %doc %{_mandir}/man3/*.*
%{_sbindir}/*