[python-openhpi/f17] update to svn7120, fix build
Tom Callaway
spot at fedoraproject.org
Thu Mar 22 18:52:17 UTC 2012
commit af42924d4ab70c041f057591c06b25cf760b2904
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu Mar 22 14:52:14 2012 -0400
update to svn7120, fix build
python-openhpi-30fix.patch | 36 ++++++++++++++++++++++++++++++++++++
python-openhpi-totaltests.patch | 25 ++++++-------------------
python-openhpi.spec | 15 ++++++++++-----
sources | 2 +-
4 files changed, 53 insertions(+), 25 deletions(-)
---
diff --git a/python-openhpi-30fix.patch b/python-openhpi-30fix.patch
new file mode 100644
index 0000000..08b16f8
--- /dev/null
+++ b/python-openhpi-30fix.patch
@@ -0,0 +1,36 @@
+diff -up python-openhpi/ohpi.i.fix python-openhpi/ohpi.i
+--- python-openhpi/ohpi.i.fix 2012-03-22 14:45:24.510669048 -0400
++++ python-openhpi/ohpi.i 2012-03-22 14:49:00.414796624 -0400
+@@ -74,22 +74,24 @@ typedef struct {
+ SaHpiUint64T oHpiVersionGet(void);
+
+ /* Exported OpenHPI handler (plugin instance) calls */
+-SaErrorT oHpiHandlerCreate(GHashTable *config,
++SaErrorT oHpiHandlerCreate(SaHpiSessionIdT sid,
++ GHashTable *config,
+ oHpiHandlerIdT *id);
+-SaErrorT oHpiHandlerDestroy(oHpiHandlerIdT id);
+-SaErrorT oHpiHandlerInfo(oHpiHandlerIdT id, oHpiHandlerInfoT *info);
+-SaErrorT oHpiHandlerGetNext(oHpiHandlerIdT id, oHpiHandlerIdT *next_id);
++SaErrorT oHpiHandlerDestroy(SaHpiSessionIdT sid, oHpiHandlerIdT id);
++SaErrorT oHpiHandlerInfo(SaHpiSessionIdT sid, oHpiHandlerIdT id, oHpiHandlerInfoT *info, GHashTable *conf_params);
++SaErrorT oHpiHandlerGetNext(SaHpiSessionIdT sid, oHpiHandlerIdT id, oHpiHandlerIdT *next_id);
+ SaErrorT oHpiHandlerFind(SaHpiSessionIdT sid,
+ SaHpiResourceIdT rid,
+ oHpiHandlerIdT *id);
+-SaErrorT oHpiHandlerRetry(oHpiHandlerIdT id);
++SaErrorT oHpiHandlerRetry(SaHpiSessionIdT sid, oHpiHandlerIdT id);
+
+ /* Global parameters */
+-SaErrorT oHpiGlobalParamGet(oHpiGlobalParamT *param);
+-SaErrorT oHpiGlobalParamSet(oHpiGlobalParamT *param);
++SaErrorT oHpiGlobalParamGet(SaHpiSessionIdT sid, oHpiGlobalParamT *param);
++SaErrorT oHpiGlobalParamSet(SaHpiSessionIdT sid, oHpiGlobalParamT *param);
+
+ /* Injector */
+-SaErrorT oHpiInjectEvent(oHpiHandlerIdT id,
++SaErrorT oHpiInjectEvent(SaHpiSessionIdT sid,
++ oHpiHandlerIdT id,
+ SaHpiEventT *event,
+ SaHpiRptEntryT *rpte,
+ SaHpiRdrT *rdr);
diff --git a/python-openhpi-totaltests.patch b/python-openhpi-totaltests.patch
index f04789f..3fb75f1 100644
--- a/python-openhpi-totaltests.patch
+++ b/python-openhpi-totaltests.patch
@@ -1,8 +1,7 @@
-diff --git a/openhpi.i b/openhpi.i
-index 62099ae..dcd1694 100644
---- a/openhpi.i
-+++ b/openhpi.i
-@@ -699,7 +699,6 @@ int memcmp(const void *s1, const void *s2, size_t n);
+diff -up python-openhpi/openhpi.i.totaltests python-openhpi/openhpi.i
+--- python-openhpi/openhpi.i.totaltests 2008-03-26 09:24:19.000000000 -0400
++++ python-openhpi/openhpi.i 2012-03-22 14:42:59.108929825 -0400
+@@ -699,7 +699,6 @@ int memcmp(const void *s1, const void *s
%sizeof(SaHpiDimiTestVariableParamsT)
%sizeof(SaHpiDimiTestPercentCompletedT)
%sizeof(SaHpiDimiReadyT)
@@ -10,7 +9,7 @@ index 62099ae..dcd1694 100644
%sizeof(SaHpiDimiInfoT)
%sizeof(SaHpiDimiRecT)
%sizeof(SaHpiFumiNumT)
-@@ -1236,7 +1235,7 @@ int memcmp(const void *s1, const void *s2, size_t n);
+@@ -1236,7 +1235,7 @@ int memcmp(const void *s1, const void *s
};
%extend SaHpiDimiInfoT {
@@ -19,16 +18,4 @@ index 62099ae..dcd1694 100644
SaHpiDimiInfoT *o;
o = (SaHpiDimiInfoT *)malloc(sizeof(SaHpiDimiInfoT));
memset(o, 0, sizeof(SaHpiDimiInfoT));
-diff --git a/sahpi.i b/sahpi.i
-index eaf825d..2fadc1b 100644
---- a/sahpi.i
-+++ b/sahpi.i
-@@ -2238,7 +2238,7 @@ typedef enum {
- typedef SaHpiUint32T SaHpiDimiTotalTestsT;
-
- typedef struct {
-- SaHpiDimiTotalTestsT NumberOfTests; /* It is recommended that the DIMI
-+ SaHpiUint32T NumberOfTests; /* It is recommended that the DIMI
- advertise all available tests
- regardless of ServiceImpact or
- Service OS */
+diff -up python-openhpi/sahpi.i.totaltests python-openhpi/sahpi.i
diff --git a/python-openhpi.spec b/python-openhpi.spec
index 1da609e..c837db2 100644
--- a/python-openhpi.spec
+++ b/python-openhpi.spec
@@ -1,12 +1,12 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global srcname py-openhpi
-%global svnrev 6930
-%global svndate 20090109
+%global svnrev 7120
+%global svndate 20120322
Name: python-openhpi
Version: 1.2
-Release: 0.5.%{svndate}svn%{svnrev}%{?dist}
+Release: 0.6.%{svndate}svn%{svnrev}%{?dist}
Summary: Python interface for OpenHPI
Group: Development/Languages
@@ -17,6 +17,7 @@ URL: http://www.openhpi.org
Source0: %{name}-svn%{svnrev}.tar.bz2
Patch0: %{name}-totaltests.patch
Patch1: %{name}-fumirollback.patch
+Patch2: python-openhpi-30fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel, swig, glib2-devel, openhpi-devel >= 2.10
@@ -31,8 +32,9 @@ SaHpiAtca.h, SaHpiBladeCenter.h, oHpi.h, and oh_utils.h.
%prep
%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .totaltests
+%patch1 -p1 -b .fumirollback
+%patch2 -p1 -b .fix
%build
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 22 2012 Tom Callaway <spot at fedoraproject.org> - 1.2-0.6.20120322svn7120
+- update to svn7120
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.5.20090109svn6930
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index dd1fd0e..4814464 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1682d7e1d8e2090fe29f2ccd28855c74 python-openhpi-svn6930.tar.bz2
+c72276a5c4c128117834156e45f6b3e2 python-openhpi-svn7120.tar.bz2
More information about the scm-commits
mailing list