Merge branch 'feature/upstream' into develop

1 files changed, 7 insertions, 3 deletions

diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 27b4b67..c1f0278 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,14 +3,14 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
-Group:     System/Management
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 URL:       http://ipmiutil.sourceforge.net
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%define group  System/Management
 # Suggests: cron or vixie-cron or cronie or similar
 %{!?_unitdir: %define _unitdir  /usr/lib/systemd/system}
 %define unit_dir  %{_unitdir}
@@ -20,8 +20,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %define bldreq_extra libtool 
 %if 0%{?fedora} >= 15
 %define bldreq_extra systemd autoconf automake systemd-units
+%define group System Environment/Base
 Requires:  systemd-units
-Group:     System Environment/Base
 %if 0%{?fedora} == 16
 %define unit_dir  /lib/systemd/system
 %endif
@@ -42,6 +42,7 @@ Group:     System Environment/Base
 # Requires: %{?systemd_requires}
 %endif
 BuildRequires: %{bldreq0} %{bldreq_extra}
+Group:     %{group}
 
 %description
 The ipmiutil package provides easy-to-use utilities to view the SEL,
@@ -170,6 +171,7 @@ rm -rf %{buildroot}
 %{_mandir}/man8/itsol.8*
 %{_mandir}/man8/idcmi.8*
 %{_mandir}/man8/iuser.8*
+%{_mandir}/man8/iseltime.8*
 %doc AUTHORS ChangeLog COPYING NEWS README TODO 
 %doc doc/UserGuide
 
@@ -373,6 +375,8 @@ fi
 %endif
 
 %changelog
+* Fri Jul 20 2018 Andrew Cress <arcress at users.sourceforge.net> 3.1.2-1
+- resolve doubly-defined Group for Fedora
 * Mon Jun 29 2015 Andrew Cress <arcress at users.sourceforge.net> 2.9.7-1
 - move libipmiutil.so from devel into ipmiutil base package (RH#1177213)
 * Mon Nov 03 2014 Andrew Cress <arcress at users.sourceforge.net> 2.9.5-1