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

1 files changed, 9 insertions, 5 deletions

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