diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-06-26 00:22:36 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-06-26 00:22:36 +0200 |
| commit | 8c9d76589b8a385edf03627f917cff7b753c88b7 (patch) | |
| tree | 104da20235169314ae4d3c2d0f4bb1d14bcb798b /doc | |
| parent | afca8e5a682f3b087d9e63cf88a1ab0bdcba523c (diff) | |
| parent | 40234879fb4fc1337ed040573ad9a03fb6580109 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 28 | ||||
| -rw-r--r-- | doc/UserGuide | 2 | ||||
| -rw-r--r-- | doc/ipmiutil.spec | 3 |
3 files changed, 17 insertions, 16 deletions
diff --git a/doc/Makefile b/doc/Makefile index 6bedc71..8486cb1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -113,9 +113,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.1.0 +PACKAGE_STRING = ipmiutil 3.1.1 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.1.0 +PACKAGE_VERSION = 3.1.1 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 3.1.0 -abs_builddir = /usr/dev/ipmiutil-3.1.0/doc -abs_srcdir = /usr/dev/ipmiutil-3.1.0/doc -abs_top_builddir = /usr/dev/ipmiutil-3.1.0 -abs_top_srcdir = /usr/dev/ipmiutil-3.1.0 +VERSION = 3.1.1 +abs_builddir = /usr/dev/ipmiutil-3.1.1/doc +abs_srcdir = /usr/dev/ipmiutil-3.1.1/doc +abs_top_builddir = /usr/dev/ipmiutil-3.1.1 +abs_top_srcdir = /usr/dev/ipmiutil-3.1.1 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -159,7 +159,7 @@ host_vendor = redhat htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.0/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.1/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/doc/UserGuide b/doc/UserGuide index d4286f2..7f7b705 100644 --- a/doc/UserGuide +++ b/doc/UserGuide @@ -1,6 +1,6 @@ IPMIUTIL USER GUIDE - VERSION 3.1.0 + VERSION 3.1.1 An easy-to-use IPMI server management utility diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index cbca232..27b4b67 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD @@ -279,6 +279,7 @@ else IPMIret=1 which dmidecode >/dev/null 2>&1 && IPMIret=0 if [ $IPMIret -eq 0 ]; then + IPMIret=1 %{_sbindir}/dmidecode |grep -q IPMI && IPMIret=0 if [ $IPMIret -eq 0 ]; then if [ -d %{_sysconfdir}/cron.daily ]; then |