From db5e8f26947114f06480dd22b9db7e22e50ee133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 Aug 2016 05:56:37 +0200 Subject: Imported Upstream version 3.0.0 --- doc/Makefile | 28 ++++++++++++++-------------- doc/UserGuide | 2 +- doc/ipmiutil.spec | 12 ++++++++---- 3 files changed, 23 insertions(+), 19 deletions(-) (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 4c9b615..1c9e94e 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-2.9.9/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.0/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-2.9.9/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.0/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 2.9.9 +PACKAGE_STRING = ipmiutil 3.0.0 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 2.9.9 +PACKAGE_VERSION = 3.0.0 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 = 2.9.9 -abs_builddir = /usr/dev/ipmiutil-2.9.9/doc -abs_srcdir = /usr/dev/ipmiutil-2.9.9/doc -abs_top_builddir = /usr/dev/ipmiutil-2.9.9 -abs_top_srcdir = /usr/dev/ipmiutil-2.9.9 +VERSION = 3.0.0 +abs_builddir = /usr/dev/ipmiutil-3.0.0/doc +abs_srcdir = /usr/dev/ipmiutil-3.0.0/doc +abs_top_builddir = /usr/dev/ipmiutil-3.0.0 +abs_top_srcdir = /usr/dev/ipmiutil-3.0.0 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-2.9.9/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.0/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/doc/UserGuide b/doc/UserGuide index 142ecb2..8205c46 100644 --- a/doc/UserGuide +++ b/doc/UserGuide @@ -1,6 +1,6 @@ IPMIUTIL USER GUIDE - VERSION 2.9.9 + VERSION 3.0.0 An easy-to-use IPMI server management utility diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index bff272f..47d1e14 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 2.9.9 +Version: 3.0.0 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD @@ -35,9 +35,9 @@ BuildRequires: gcc gcc-c++ libtool %else %if 0%{?rhel} >= 7 BuildRequires: systemd-units -%define unit_dir %{_unitdir} %endif -%{!?unit_dir: %define unit_dir /usr/lib/systemd/system} +%{!?_unitdir: %define _unitdir /usr/lib/systemd/system} +%define unit_dir %{_unitdir} %endif %endif %define init_dir %{_initrddir} @@ -117,7 +117,7 @@ rm -rf %{buildroot} %{_sbindir}/ifirewall %{_sbindir}/ifwum %{_sbindir}/ihpm -%{_libdir}/libipmiutil.so* +%{_libdir}/libipmiutil.so.1 %{_datadir}/%{name}/ipmiutil_evt %{_datadir}/%{name}/ipmiutil_asy %{_datadir}/%{name}/ipmiutil_wdt @@ -176,12 +176,16 @@ rm -rf %{buildroot} %{_datadir}/%{name}/isensor.h %{_datadir}/%{name}/ievents.h %{_datadir}/%{name}/Makefile +%{_libdir}/libipmiutil.so %{_includedir}/ipmicmd.h %files static %defattr(-,root,root) %{_libdir}/libipmiutil.a +%post devel +/sbin/ldconfig + %pre %if 0%{?req_systemd} %service_add_pre ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service -- cgit v1.2.3