diff --git a/ipmitool/Makefile.am b/ipmitool/Makefile.am index 84ca962..888e33f 100644 --- a/ipmitool/Makefile.am +++ b/ipmitool/Makefile.am @@ -28,8 +28,8 @@ # LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, # EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -DOCDIR = $(DESTDIR)/$(datadir)/doc/$(PACKAGE) -DOCLIST = README COPYING AUTHORS ChangeLog +DOCDIR = $(datadir)/doc/$(PACKAGE) +DOCLIST = $(top_srcdir)/README $(top_srcdir)/COPYING $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog EXTRA_DIST = $(DOCLIST) \ debian/changelog debian/control debian/copyright \ @@ -48,8 +48,11 @@ dist-hook: cp control/ipmitool.spec $(distdir) install-data-local: - mkdir -p $(DOCDIR) - $(INSTALL_DATA) -m 644 $(DOCLIST) $(DOCDIR) + mkdir -p $(DESTDIR)$(DOCDIR) + $(INSTALL_DATA) $(DOCLIST) $(DESTDIR)$(DOCDIR) + +uninstall-local: + -rm -rf $(DESTDIR)$(DOCDIR) .PHONY: pkg pkg: PKG := ipmitool-@VERSION@-@OS@-@ARCH@ diff --git a/ipmitool/configure.in b/ipmitool/configure.in index 6d81a70..15db517 100644 --- a/ipmitool/configure.in +++ b/ipmitool/configure.in @@ -356,8 +356,8 @@ AC_ARG_ENABLE([ipmishell], [enable IPMI shell interface [default=yes]])], [], [enable_ipmishell=yes]) if test "x$enable_ipmishell" = "xyes"; then - AC_SEARCH_LIBS([tgetent], [readline ncurses curses termcap]) - AC_SEARCH_LIBS([initscr], [curses ncurses], [have_curses=yes]) + AC_SEARCH_LIBS([tgetent], [tinfo ncurses curses readline termcap]) + AC_SEARCH_LIBS([initscr], [ncurses curses], [have_curses=yes]) AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes]) if test "x$have_curses" = "xyes" && test "x$have_readline" = "xyes"; then AC_DEFINE(HAVE_READLINE, [1], [Define to 1 if readline present.]) diff --git a/ipmitool/contrib/Makefile.am b/ipmitool/contrib/Makefile.am index f4f339c..d0c1571 100644 --- a/ipmitool/contrib/Makefile.am +++ b/ipmitool/contrib/Makefile.am @@ -30,9 +30,8 @@ MAINTAINERCLEANFILES = Makefile.in -dist_pkgdata_DATA = README oem_ibm_sel_map - -dist_pkgdata_SCRIPTS = bmclanconf ipmi.init.basic ipmi.init.redhat \ +EXTRA_DIST = README oem_ibm_sel_map \ + bmclanconf ipmi.init.basic ipmi.init.redhat \ ipmievd.init.redhat ipmievd.init.suse ipmievd.init.debian \ collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh diff --git a/ipmitool/control/ipmitool.spec.in b/ipmitool/control/ipmitool.spec.in index 1e7fed5..ec7cec9 100644 --- a/ipmitool/control/ipmitool.spec.in +++ b/ipmitool/control/ipmitool.spec.in @@ -5,7 +5,7 @@ Release: @RPM_RELEASE@%{?_distro:.%{_distro}} License: BSD Group: Utilities Packager: Duncan Laurie -Source: ipmitool-@VERSION@.tar.gz +Source: %{name}-%{version}.tar.gz Buildroot: /var/tmp/ipmitool-root %description @@ -50,18 +50,64 @@ make DESTDIR=$RPM_BUILD_ROOT install-strip if [ "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ]; then rm -rf $RPM_BUILD_ROOT fi -rm -rf $RPM_BUILD_DIR/ipmitool-@VERSION@ %files -%defattr(-,root,root) -%{_bindir}/* -%{_sbindir}/* -%{_datadir}/ipmitool/* -%doc %{_mandir}/man1/* -%doc %{_mandir}/man8/* -%doc %{_datadir}/doc/ipmitool/* +%defattr(755,root,root) +%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_sbindir}/* +%{_mandir}/man*/* +%doc %{_datadir}/doc/ipmitool + %changelog +* Fri Feb 23 2007 1.8.9-1 + - Added initial AMC ekey query operation support + - Improvements to ekeying support (PICMG 3.x only) + - Added initial interactive edition support for multirec; added IANA + verification before interpreting PICMG records. + - Added edit support for AMC activation "Maximum Internal Current" + - Fix bug generating garbage on the screen when handling GetDeviceId + and sol traffic occurs + - Added ability to map OEM sensor types to OEM description string using + IANA number; moved IANA number table + - Fix lan set access command to use value already saved within parameters + for PEF and authentication + - Fix bug in cmd ipmitool lan stats get 1 + - Add support to allow ipmitool/ipmievd to target specific device nodes + on multi-BMC systems + - Add support for name+privilege lookup for lanplus sessions + - Fix time_t conversion bug for 64-bit OS + - Added prefix of hostname on sel ipmievd sessions + - Fixed FWUM Get Info + - Fix ipmievd fd closing bug + - Add set-in-progress flag support to chassis bootdev + - Added new chassis bootdev options + - Add sol payload enable/disable comman + - Fix SOL set errors when commit-write not supported + - Fix reset of session timeout for lanplus interface + - Fixed lan interface accessibility timeout handling + - Fix bug with Function Get Channel Cipher Suites command when more + than 1 page used. + - Fix missing firmware firewall top-level command + - Fix bug in SOL keepalive functionality + - Fix SOLv2 NACK and retry handling for Intel ESB2 BMC + - Added ipmi_sel_get_oem_sensor* APIs + - Added HPM.1 support + - Fix segfault when incorrect oem option supplied + - Fix bus problem with spd command + - Fix segfault in SOL when remote BMC does not return packet + - Adjust packet length for AMC.0 retricting IPMB packets to 32 bytes + - Added lan packet size reduction mechanism + - Fix bug with sendMessage of bad length with different target + - Fix for big endian (PPC) architecture + - NetBSD fixes + - Fix segfault and channel problem with user priv command + - Add support for bus/chan on i2c raw command + - Add freeipmi interface support + - Add remote spd printing + - Add better detection of linux/compiler.h to config + - Makefile changes to fix makedistcheck, etc. + * Tue May 02 2006 1.8.8-1 - Fix segfaults in sensor data repository list - Fix ipmievd to open interface before daemonizing