Merge branch 'release/debian/3.1.1-1'debian/3.1.1-1

3 files changed, 24 insertions, 20 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 5b0b4b1..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.0.8/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.8/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.0.8/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.8/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.0.8/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.0.8
+PACKAGE_STRING = ipmiutil 3.1.1
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.8
+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.0.8
-abs_builddir = /usr/dev/ipmiutil-3.0.8/doc
-abs_srcdir = /usr/dev/ipmiutil-3.0.8/doc
-abs_top_builddir = /usr/dev/ipmiutil-3.0.8
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.8
+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.0.8/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 105a4bd..7f7b705 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 3.0.8
+                     VERSION 3.1.1
          An easy-to-use IPMI server management utility
 
 
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 7551bb2..27b4b67 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.0.8
+Version: 3.1.1
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
@@ -16,8 +16,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %define unit_dir  %{_unitdir}
 %define init_dir  %{_initrddir}
 %define systemd_fls %{_datadir}/%{name}
-%define bldreq0   openssl-devel 
-%define bldreq_extra gcc gcc-c++ libtool 
+%define bldreq0   openssl-devel gcc gcc-c++
+%define bldreq_extra libtool 
 %if 0%{?fedora} >= 15
 %define bldreq_extra systemd autoconf automake systemd-units
 Requires:  systemd-units
@@ -25,6 +25,9 @@ Group:     System Environment/Base
 %if 0%{?fedora} == 16
 %define unit_dir  /lib/systemd/system
 %endif
+%if 0%{?fedora} >= 25
+%define bldreq_extra systemd autoconf automake systemd-units qrencode-libs
+%endif
 %endif
 %if 0%{?rhel} >= 7
 %define bldreq_extra autoconf automake systemd-units
@@ -33,7 +36,7 @@ Group:     System Environment/Base
 %define bldreq0 libopenssl-devel 
 %endif
 %if 0%{?suse_version} >= 1210
-%define bldreq_extra gcc gcc-c++ libtool systemd
+%define bldreq_extra libtool systemd
 %define req_systemd 1
 %define systemd_fls %{unit_dir}
 # Requires: %{?systemd_requires}
@@ -172,7 +175,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-# %{_datadir}/%{name} is used by both ipmiutil and ipmituil-devel
+# .{_datadir}/.{name} is used by both ipmiutil and ipmiutil-devel
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/ipmi_sample.c
 %{_datadir}/%{name}/ipmi_sample_evt.c
@@ -276,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