rpms/openhpi/devel openhpi-2.10.1-gcc43.patch, NONE, 1.1 openhpi.spec, 1.61, 1.62

[Phil Knirsch (pknirsch)]

Author: pknirsch

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15897

Modified Files:
	openhpi.spec 
Added Files:
	openhpi-2.10.1-gcc43.patch 
Log Message:
- Removed incorrect patch for IBM BC snmp_bc plugin
- Fixed GCC 4.3 rebuild problems


openhpi-2.10.1-gcc43.patch:

--- NEW FILE openhpi-2.10.1-gcc43.patch ---
diff -up openhpi-2.10.1/utils/epath_utils.h.gcc43 openhpi-2.10.1/utils/epath_utils.h
--- openhpi-2.10.1/utils/epath_utils.h.gcc43	2008-02-28 09:18:03.000000000 +0100
+++ openhpi-2.10.1/utils/epath_utils.h	2008-02-28 09:18:09.000000000 +0100
@@ -32,7 +32,7 @@
 #define OH_MAX_LOCATION_DIGITS 6
 
 /* Definitions for describing entity path patterns */
-#define OH_MAX_EP_TUPLES SAHPI_MAX_ENTITY_PATH+1
+#define OH_MAX_EP_TUPLES SAHPI_MAX_ENTITY_PATH+2
 
 typedef struct {
         SaHpiBoolT is_dot;
diff -up openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp.gcc43 openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp
--- openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp.gcc43	2008-02-28 09:26:14.000000000 +0100
+++ openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp	2008-02-28 09:28:59.000000000 +0100
@@ -422,12 +422,15 @@ cIpmiSensorFactors::ConvertToRaw( tIpmiR
             // the corresponding interpreted value decreases
             // so we have to take that into account when searching
             if ( swap == false )
-               if ((val > cval) && (raw < maxraw))
-                    raw++;
+               {
+                 if ((val > cval) && (raw < maxraw))
+                      raw++;
+               }
             else
-               if ((val < cval) && (raw < maxraw))
-                    raw++;
-
+               {
+                 if ((val < cval) && (raw < maxraw))
+                      raw++;
+               }
 	    break;
 
        case eRoundDown:
@@ -435,12 +438,15 @@ cIpmiSensorFactors::ConvertToRaw( tIpmiR
             // the corresponding interpreted value decreases
             // so we have to take that into account when searching
             if ( swap == false )
-                if ( ( val < cval) && (raw > minraw ) )
-                    raw--;
+               {
+                 if ( ( val < cval) && (raw > minraw ) )
+                     raw--;
+               }
             else
-                if ( ( val > cval) && (raw > minraw ) )
-                    raw--;
-
+               {
+                 if ( ( val > cval) && (raw > minraw ) )
+                     raw--;
+               }
 	    break;
      }
 
diff -up openhpi-2.10.1/plugins/ipmidirect/ipmi_con_lan.cpp.gcc43 openhpi-2.10.1/plugins/ipmidirect/ipmi_con_lan.cpp
--- openhpi-2.10.1/plugins/ipmidirect/ipmi_con_lan.cpp.gcc43	2008-02-28 09:18:48.000000000 +0100
+++ openhpi-2.10.1/plugins/ipmidirect/ipmi_con_lan.cpp	2008-02-28 09:18:57.000000000 +0100
@@ -791,7 +791,7 @@ cIpmiConLan::IfSendCmd( cIpmiRequest *r 
        tmsg[pos++] = 0x81; // Remote console IPMI Software ID
        tmsg[pos++] = r->m_seq << 2;
        tmsg[pos++] = eIpmiCmdSendMsg;
-       tmsg[pos++] =   r->m_send_addr.m_channel & 0xf
+       tmsg[pos++] =  ( r->m_send_addr.m_channel & 0xf )
                      | (1 << 6); // Turn on tracking
 
        if ( r->m_send_addr.m_type == eIpmiAddrTypeIpmbBroadcast )


Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- openhpi.spec	19 Feb 2008 19:48:10 -0000	1.61
+++ openhpi.spec	28 Feb 2008 15:55:04 -0000	1.62
@@ -1,15 +1,16 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
 Source1: openhpi.conf
 Patch1: openhpi-2.8.0-werror.patch
-Patch2: openhpi-2.8.1-snmp_bc_discover.patch
+#Patch2: openhpi-2.8.1-snmp_bc_discover.patch
 Patch3: openhpi-2.8.1-segfault.patch
 Patch4: openhpi-2.8.1-open.patch
+Patch5: openhpi-2.10.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: elfutils-devel, rpm-devel, libtool-ltdl-devel, bzip2-devel
@@ -43,9 +44,10 @@
 %prep
 %setup -q
 %patch1 -p1 -b .werror
-%patch2 -p1 -b .snmp_bc_discover
+#%patch2 -p1 -b .snmp_bc_discover
 %patch3 -p1 -b .segfault
 %patch4 -p1 -b .open
+%patch5 -p1 -b .gcc43
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -97,6 +99,10 @@
 
 
 %changelog
+* Thu Feb 28 2008 Phil Knirsch <pknirsch at redhat.com> - 2.10.1-3
+- Removed incorrect patch for IBM BC snmp_bc plugin
+- Fixed GCC 4.3 rebuild problems
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.10.1-2
 - Autorebuild for GCC 4.3