From c71bf8390b9a06fa498d2cb4f8a4924309f4875e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 11 Apr 2020 11:24:36 +0200 Subject: New upstream version 3.1.6 --- doc/Makefile | 32 ++++++++++++++++---------------- doc/Makefile.am | 2 +- doc/Makefile.in | 2 +- doc/UserGuide | 2 +- doc/ipmiutil.spec | 7 +++++-- 5 files changed, 24 insertions(+), 21 deletions(-) (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 615da92..ce8be1a 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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11 -AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run tar AR = ar -AUTOCONF = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoconf -AUTOHEADER = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoheader -AUTOMAKE = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -99,13 +99,13 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o -OS_CFLAGS = -DLINUX -DSKIP_MD2 -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 +OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c OS_LFLAGS = OTOOL = @@ -113,9 +113,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.1.5 +PACKAGE_STRING = ipmiutil 3.1.6 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.1.5 +PACKAGE_VERSION = 3.1.6 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.5 -abs_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5/doc -abs_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5/doc -abs_top_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5 -abs_top_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5 +VERSION = 3.1.6 +abs_builddir = /usr/dev/ipmiutil-3.1.6/doc +abs_srcdir = /usr/dev/ipmiutil-3.1.6/doc +abs_top_builddir = /usr/dev/ipmiutil-3.1.6 +abs_top_srcdir = /usr/dev/ipmiutil-3.1.6 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} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.6/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -417,7 +417,7 @@ install: ${INSTALL_DATA_SH} iuser.8 ${manto} ${INSTALL_DATA_SH} iseltime.8 ${manto} ${INSTALL_DATA_SH} bmclanpet.mib ${datato} - cd ${manto}; gzip -f *.8 + cd ${manto}; gzip -nf *.8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/Makefile.am b/doc/Makefile.am index b792762..0b782bb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -59,5 +59,5 @@ install: ${INSTALL_DATA_SH} iuser.8 ${manto} ${INSTALL_DATA_SH} iseltime.8 ${manto} ${INSTALL_DATA_SH} bmclanpet.mib ${datato} - cd ${manto}; gzip -f *.8 + cd ${manto}; gzip -nf *.8 diff --git a/doc/Makefile.in b/doc/Makefile.in index 3b9d20d..7f334af 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -417,7 +417,7 @@ install: ${INSTALL_DATA_SH} iuser.8 ${manto} ${INSTALL_DATA_SH} iseltime.8 ${manto} ${INSTALL_DATA_SH} bmclanpet.mib ${datato} - cd ${manto}; gzip -f *.8 + cd ${manto}; gzip -nf *.8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/UserGuide b/doc/UserGuide index da88938..ba6f086 100644 --- a/doc/UserGuide +++ b/doc/UserGuide @@ -1,6 +1,6 @@ IPMIUTIL USER GUIDE - VERSION 3.1.5 + VERSION 3.1.6 An easy-to-use IPMI server management utility diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index 3e8eddd..9de2886 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 3.1.5 +Version: 3.1.6 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD @@ -136,7 +136,7 @@ rm -rf %{buildroot} %{systemd_fls}/ipmiutil_asy.service %{systemd_fls}/ipmiutil_wdt.service %{systemd_fls}/ipmi_port.service -%{_datadir}/%{name}/ipmiutil.env +%{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.pre %{_datadir}/%{name}/ipmiutil.setup %{_datadir}/%{name}/ipmi_if.sh @@ -217,6 +217,9 @@ scr_dir=%{_datadir}/%{name} if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then # Replace if exists, append if not. # Use # as the sed delimiter to prevent handling slash in the path. + if [ ! -f %{_datadir}/%{name}/ipmiutil.env ]; then + cp %{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.env + fi grep -q 'IINITDIR' %{_datadir}/%{name}/ipmiutil.env \ && sed -i 's#^IINITDIR=.*#IINITDIR=%{init_dir}#' %{_datadir}/%{name}/ipmiutil.env \ || echo "IINITDIR=%{init_dir}" >> %{_datadir}/%{name}/ipmiutil.env -- cgit v1.2.3