diff --git a/automake-1_13.patch b/automake-1_13.patch new file mode 100644 index 0000000..7ec5f26 --- /dev/null +++ b/automake-1_13.patch @@ -0,0 +1,12 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmiutil-2.8.8/configure.in ./configure.in +--- ../orig-ipmiutil-2.8.8/configure.in 2013-02-06 16:16:23.000000000 +0100 ++++ ./configure.in 2013-02-28 14:34:28.241199677 +0100 +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(util/ipmiutil.c) + AM_INIT_AUTOMAKE(ipmiutil,2.8.8) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_PREFIX_DEFAULT(/usr) + diff --git a/ipmiutil-2.8.5.tar.gz b/ipmiutil-2.8.5.tar.gz deleted file mode 100644 index 4e5c071..0000000 --- a/ipmiutil-2.8.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6846e6621b9df23b1ed37662c075381dbb082f3e719803c9ef8784dd3154439c -size 1615967 diff --git a/ipmiutil-2.8.8.tar.gz b/ipmiutil-2.8.8.tar.gz new file mode 100644 index 0000000..6d44641 --- /dev/null +++ b/ipmiutil-2.8.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db0fd15d3c8a8ee27b85e6a7b014fcdcf1b040771336294dea935b0dc18326b7 +size 1656062 diff --git a/ipmiutil.changes b/ipmiutil.changes index 95e1309..16ce766 100644 --- a/ipmiutil.changes +++ b/ipmiutil.changes @@ -1,7 +1,19 @@ +------------------------------------------------------------------- +Thu Feb 28 13:35:16 UTC 2013 - kkaempf@suse.com + +- Fix for automake 1.13 + +------------------------------------------------------------------- +Thu Feb 28 13:26:58 UTC 2013 - kkaempf@suse.com + +- update to upstream ipmiutil-2.8.8 + See http://ipmiutil.sourceforge.net/docs/ChangeLog + ------------------------------------------------------------------- Fri Aug 24 20:17:25 UTC 2012 - arcress@users.sourceforge.net - update to upstream ipmiutil-2.8.5 + See http://ipmiutil.sourceforge.net/docs/ChangeLog ------------------------------------------------------------------- Tue Jun 26 13:30:25 UTC 2012 - arcress@users.sourceforge.net diff --git a/ipmiutil.spec b/ipmiutil.spec index 310bbb3..3bc8f4b 100644 --- a/ipmiutil.spec +++ b/ipmiutil.spec @@ -1,7 +1,7 @@ # # spec file for package ipmiutil # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Andy Cress # # All modifications and additions to the file contributed by third parties @@ -17,24 +17,31 @@ # - Name: ipmiutil -Version: 2.8.5 +Version: 2.8.8 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD-3-Clause Group: System/Management Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch: automake-1_13.patch Url: http://ipmiutil.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1210 %define req_systemd 1 %endif %if 0%{?req_systemd} -BuildRequires: gcc gcc-c++ libtool openssl-devel systemd +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: systemd %define systemd_fls %{_unitdir} %else -BuildRequires: gcc gcc-c++ libtool openssl-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: openssl-devel %define systemd_fls %{_datadir}/%{name} %endif @@ -53,8 +60,8 @@ or the Intel IPMI driver (/dev/imb), etc. If used locally and no driver is detected, ipmiutil will use user-space direct I/Os instead. %package devel -Group: Development/Libraries/C and C++ Summary: The includes headers and static libraries from the ipmiutil package +Group: Development/Libraries/C and C++ Requires: ipmiutil %description devel @@ -63,6 +70,7 @@ useful for building custom IPMI applications. %prep %setup -q +%patch -p1 %build autoreconf -fiv @@ -76,6 +84,9 @@ make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +rm -rf %{buildroot}%{_datadir}/%{name}/ievents.[ch] +rm -rf %{buildroot}%{_datadir}/%{name}/ipmi_sample_evt.[ch] +rm -rf %{buildroot}%{_datadir}/%{name}/isensor.[ch] %clean rm -rf %{buildroot} @@ -109,6 +120,7 @@ rm -rf %{buildroot} %{_datadir}/%{name}/ipmiutil_asy %{_datadir}/%{name}/ipmiutil_wdt %{_datadir}/%{name}/ipmi_port +%{_datadir}/%{name}/ipmi_info %{_datadir}/%{name}/checksel %{systemd_fls}/ipmiutil_evt.service %{systemd_fls}/ipmiutil_asy.service