Accepting request 310576 from home:pluskalm:branches:systemsmanagement

- Update to 2.9.6
  * for detailed list of changes see http://ipmiutil.sourceforge.net/docs/ChangeLog
- Drop ipmiutil-2.9.5-fix-bashisms.patch as it was accepted by upstream

OBS-URL: https://build.opensuse.org/request/show/310576
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmiutil?expand=0&rev=31
This commit is contained in:
Andy Cress 2015-06-05 18:37:31 +00:00 committed by Git OBS Bridge
parent b7f6de1d8e
commit 46119761a9
6 changed files with 20 additions and 163 deletions

View File

@ -1,8 +1,9 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmiutil-2.9.2/configure.ac ./configure.ac
--- ../orig-ipmiutil-2.9.2/configure.ac 2013-10-09 20:20:02.000000000 +0200
+++ ./configure.ac 2013-10-15 08:21:48.521304910 +0200
@@ -2,7 +2,7 @@
AC_INIT(ipmiutil,2.9.5)
Index: ipmiutil-2.9.6/configure.ac
===================================================================
--- ipmiutil-2.9.6.orig/configure.ac
+++ ipmiutil-2.9.6/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
AC_INIT(ipmiutil,2.9.6)
AC_CONFIG_SRCDIR(util/ipmiutil.c)
echo "ipmiutil version ${PACKAGE_VERSION}"
-AM_CONFIG_HEADER(config.h)

View File

@ -1,149 +0,0 @@
diff -Ndur ipmiutil-2.9.2/scripts/ipmi_info ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_info
--- ipmiutil-2.9.2/scripts/ipmi_info 2013-10-09 21:20:02.000000000 +0300
+++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_info 2014-11-17 06:41:28.838462431 +0200
@@ -44,7 +44,7 @@
start()
{
- echo -n $"Starting $name: "
+ echo -n "Starting $name: "
echo
retval=0
PID=0
@@ -66,7 +66,7 @@
stop()
{
- echo -n $"Stopping $name: "
+ echo -n "Stopping $name: "
echo
retval=0
echo
@@ -116,7 +116,7 @@
restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
exit 2
esac
diff -Ndur ipmiutil-2.9.2/scripts/ipmi_port.sh ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_port.sh
--- ipmiutil-2.9.2/scripts/ipmi_port.sh 2013-10-09 21:20:02.000000000 +0300
+++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_port.sh 2014-11-17 06:41:52.921460802 +0200
@@ -47,7 +47,7 @@
start()
{
- echo -n $"Starting $name: "
+ echo -n "Starting $name: "
echo
retval=1
PID=0
@@ -93,7 +93,7 @@
stop()
{
- echo -n $"Stopping $name: "
+ echo -n "Stopping $name: "
echo
retval=1
if [ -f $lockfile ]; then
@@ -178,7 +178,7 @@
restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
exit 2
esac
diff -Ndur ipmiutil-2.9.2/scripts/ipmiutil_asy ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_asy
--- ipmiutil-2.9.2/scripts/ipmiutil_asy 2013-10-09 21:20:02.000000000 +0300
+++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_asy 2014-11-17 06:42:11.496459545 +0200
@@ -39,7 +39,7 @@
start()
{
- echo -n $"Starting $dname: "
+ echo -n "Starting $dname: "
driverok=0
dtype=`ipmiutil cmd -k |grep "IPMI access" |cut -f2 -d'=' |awk '{ print $1 }'`
if [ "x$dtype" = "xopen" ]; then
@@ -67,7 +67,7 @@
stop()
{
- echo -n $"Stopping $dname: "
+ echo -n "Stopping $dname: "
retval=1
if [ -f $lockfile ]; then
p=`cat $lockfile`
@@ -148,7 +148,7 @@
restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
exit 2
esac
exit $?
diff -Ndur ipmiutil-2.9.2/scripts/ipmiutil_evt ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_evt
--- ipmiutil-2.9.2/scripts/ipmiutil_evt 2013-10-09 21:20:02.000000000 +0300
+++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_evt 2014-11-17 06:42:23.912458706 +0200
@@ -42,7 +42,7 @@
start()
{
- echo -n $"Starting $name: "
+ echo -n "Starting $name: "
# do not start if in driverless mode
ipmiutil cmd -k |grep "driverless" >/dev/null 2>&1
if [ $? -eq 0 ]; then
@@ -70,7 +70,7 @@
stop()
{
- echo -n $"Stopping $name: "
+ echo -n "Stopping $name: "
retval=1
if [ -f $lockfile ]; then
p=`cat $lockfile`
@@ -151,7 +151,7 @@
restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
exit 2
esac
exit $?
diff -Ndur ipmiutil-2.9.2/scripts/ipmiutil_wdt ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_wdt
--- ipmiutil-2.9.2/scripts/ipmiutil_wdt 2013-10-09 21:20:02.000000000 +0300
+++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_wdt 2014-11-17 06:42:32.368458133 +0200
@@ -34,7 +34,7 @@
# tmpcron2=/tmp/wdtcron2.$$
start() {
- echo -n $"Starting $prog: "
+ echo -n "Starting $prog: "
echo
# do not start if in driverless mode
ipmiutil cmd -k |grep "driverless" >/dev/null 2>&1
@@ -73,7 +73,7 @@
}
stop() {
- echo -n $"Stopping $prog: "
+ echo -n "Stopping $prog: "
echo
# first disable the watchdog
$prog -d >>$wdtlog
@@ -141,6 +141,6 @@
restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|reload}"
+ echo "Usage: $0 {start|stop|status|restart|reload}"
exit 1
esac

View File

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

3
ipmiutil-2.9.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:884c1f3d8bfb0b33c303973d286c3166f5a537976451a0312e3524af54771519
size 1672039

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 5 17:00:29 UTC 2015 - mpluskal@suse.com
- Update to 2.9.6
* for detailed list of changes see http://ipmiutil.sourceforge.net/docs/ChangeLog
- Drop ipmiutil-2.9.5-fix-bashisms.patch as it was accepted by upstream
-------------------------------------------------------------------
Wed Jan 21 23:54:03 UTC 2015 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package ipmiutil
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Andy Cress
#
# All modifications and additions to the file contributed by third parties
@ -18,14 +18,13 @@
Name: ipmiutil
Version: 2.9.5
Version: 2.9.6
Release: 1%{?dist}
Summary: Easy-to-use IPMI server management utilities
License: BSD-3-Clause
Group: System/Management
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch: automake-1_13.patch
Patch1: %{name}-2.9.5-fix-bashisms.patch
Patch0: automake-1_13.patch
Url: http://ipmiutil.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1210
@ -68,8 +67,7 @@ useful for building custom IPMI applications.
%prep
%setup -q
%patch -p1
%patch1 -p1
%patch0 -p1
%build
autoreconf -fiv