New upstream version 3.1.2upstream/3.1.2

4 files changed, 17 insertions, 20 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 00489fb..9eb78de 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -47,12 +47,12 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.2/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.2/missing --run tar
 AR = ar
-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
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.2/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.2/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.2/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -101,7 +101,7 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.2/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -115,9 +115,9 @@ OTOOL64 =
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.1.1
+PACKAGE_STRING = ipmiutil 3.1.2
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.1
+PACKAGE_VERSION = 3.1.2
 PATH_SEPARATOR = :
 PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
@@ -129,11 +129,11 @@ SHR_LINK = libipmiutil.so.1
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 3.1.1
-abs_builddir = /usr/dev/ipmiutil-3.1.1/lib
-abs_srcdir = /usr/dev/ipmiutil-3.1.1/lib
-abs_top_builddir = /usr/dev/ipmiutil-3.1.1
-abs_top_srcdir = /usr/dev/ipmiutil-3.1.1
+VERSION = 3.1.2
+abs_builddir = /usr/dev/ipmiutil-3.1.2/lib
+abs_srcdir = /usr/dev/ipmiutil-3.1.2/lib
+abs_top_builddir = /usr/dev/ipmiutil-3.1.2
+abs_top_srcdir = /usr/dev/ipmiutil-3.1.2
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
 am__include = include
@@ -161,7 +161,7 @@ host_vendor = redhat
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.1/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.2/install-sh
 libdir = $(iprefix)/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/lib/lanplus/Makefile.am b/lib/lanplus/Makefile.am
index c5394b1..94ae3ca 100644
--- a/lib/lanplus/Makefile.am
+++ b/lib/lanplus/Makefile.am
@@ -2,11 +2,9 @@
 
 ODIR 	= obj
 CFLAGS_STATIC  = @OS_CFLAGS@ -DSTATIC -fno-strict-aliasing -fPIC $(CFLAGS) 
-AM_CFLAGS  = @OS_CFLAGS@ -fPIC  @LANPLUS_CFLAGS@
+AM_CFLAGS  = @OS_CFLAGS@ -fPIC  @LANPLUS_CFLAGS@ -I. -I./inc
 
 MAINTAINERCLEANFILES    = Makefile.in
- 
-INCLUDES                = -I. -I./inc 
 
 lanplus_liba      = libipmi_lanplus.a
 
diff --git a/lib/lanplus/Makefile.in b/lib/lanplus/Makefile.in
index 388b4f9..e09f0ab 100644
--- a/lib/lanplus/Makefile.in
+++ b/lib/lanplus/Makefile.in
@@ -234,9 +234,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ODIR = obj
 CFLAGS_STATIC = @OS_CFLAGS@ -DSTATIC -fno-strict-aliasing -fPIC $(CFLAGS) 
-AM_CFLAGS = @OS_CFLAGS@ -fPIC  @LANPLUS_CFLAGS@
+AM_CFLAGS = @OS_CFLAGS@ -fPIC  @LANPLUS_CFLAGS@ -I. -I./inc
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I. -I./inc 
 lanplus_liba = libipmi_lanplus.a
 noinst_LIBRARIES = $(lanplus_liba)
 libipmi_lanplus_a_SOURCES = lanplus.c lanplus.h rmcp.h asf.h \
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index 97613b6..9fa5d2e 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
 
 Name: libipmiutil
 Description: Library for ipmiutil
-Version: 3.1.1
+Version: 3.1.2
 Libs: -L${libdir} -lipmi_lanplus
 Cflags: -I${includedir}