From 45cc35019c31476bd7db088fb23996f607ed7cb9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 16 Jun 2006 16:21:38 +0000 Subject: [PATCH] remove ref to linux/compiler.h to fix build --- OpenIPMI-2.0.6-badheader.patch | 20 ++++++++++++++++++++ OpenIPMI.spec | 8 +++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 OpenIPMI-2.0.6-badheader.patch diff --git a/OpenIPMI-2.0.6-badheader.patch b/OpenIPMI-2.0.6-badheader.patch new file mode 100644 index 0000000..a2c4fc6 --- /dev/null +++ b/OpenIPMI-2.0.6-badheader.patch @@ -0,0 +1,20 @@ +--- OpenIPMI-2.0.6/ipmitool-1.8.8/src/plugins/open/open.c.foo 2006-06-16 12:13:58.000000000 -0400 ++++ OpenIPMI-2.0.6/ipmitool-1.8.8/src/plugins/open/open.c 2006-06-16 12:19:09.000000000 -0400 +@@ -50,7 +50,6 @@ + #endif + + #if defined(HAVE_OPENIPMI_H) +-# include + # include + #elif defined(HAVE_FREEBSD_IPMI_H) + /* FreeBSD OpenIPMI-compatible header */ +--- OpenIPMI-2.0.6/ipmitool-1.8.8/src/ipmievd.c.foo 2006-06-16 12:14:18.000000000 -0400 ++++ OpenIPMI-2.0.6/ipmitool-1.8.8/src/ipmievd.c 2006-06-16 12:14:22.000000000 -0400 +@@ -54,7 +54,6 @@ + + #ifdef IPMI_INTF_OPEN + # if defined(HAVE_OPENIPMI_H) +-# include + # include + # elif defined(HAVE_FREEBSD_IPMI_H) + # include diff --git a/OpenIPMI.spec b/OpenIPMI.spec index db985ef..5a6f4b4 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,7 +3,7 @@ Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.6 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -11,12 +11,12 @@ Source: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source2: http://prdownloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz Source3: openipmi.sysconf Source4: openipmi.initscript +Patch1: OpenIPMI-2.0.6-badheader.patch Patch100: ipmitool-1.8.7-peftime.patch BuildRoot: /var/tmp/%{name}-%{version}-root PreReq: chkconfig BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildPrereq: openssl-devel python-devel readline-devel -BuildPrereq: glibc-kernheaders %description The Open IPMI project aims to develop an open code base to allow access to @@ -64,6 +64,7 @@ of the OpenIPMI project. %prep %setup -q -a 2 +%patch1 -p1 -b .badheader pushd ipmitool-%{ipmitoolver} %patch100 -p1 -b .peftime popd @@ -165,9 +166,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog -* Fri Jun 16 2006 Jon Masters 2.0.6-3 -- Fix a build requires (needs glibc-kernheaders) - * Thu Jun 15 2006 Jesse Keating 2.0.6-2 - Bump for new glib2