- updated for 2.0.10

Changed files:
    OpenIPMI-python.patch -> 1.4

diff --git a/OpenIPMI-python.patch b/OpenIPMI-python.patch
index c90bbc6abeab8826d525af002da19abc4df7e4e3..6796c06773c565dcc3f0aa6a98e2b73ffc539f57 100644 (file)
--- a/OpenIPMI-python.patch
+++ b/OpenIPMI-python.patch
@@ -1,17 +1,17 @@
---- OpenIPMI-2.0.7/swig/python/openipmigui/Makefile.am.orig    2006-06-08 05:10:43.000000000 +0200
-+++ OpenIPMI-2.0.7/swig/python/openipmigui/Makefile.am 2006-08-22 12:20:57.085971000 +0200
-@@ -26,7 +26,7 @@
-       $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
-       $(INSTALL_PROGRAM) $^ $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
+--- OpenIPMI-2.0.10/swig/python/openipmigui/Makefile.am.orig   2006-11-08 18:09:10.000000000 +0100
++++ OpenIPMI-2.0.10/swig/python/openipmigui/Makefile.am        2006-12-03 21:45:47.330986735 +0100
+@@ -35,7 +35,7 @@
+       done)
+       -rmdir "$(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui"
  
 -PYPATH=$(top_builddir)/swig/python:$(srcdir)
 +PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)
- PYLDPATH=$(top_builddir)/lib/.libs:$(top_builddir)/utils/.libs:$(top_builddir)/glib/.libs:$(top_builddir)/unix/.libs:$(top_builddir)/cmdlang/.libs:$(top_builddir)/tcl/.libs
  
  .py.pyc:
---- OpenIPMI-2.0.8/swig/python/Makefile.am.orig        2006-09-22 23:05:17.000000000 +0200
-+++ OpenIPMI-2.0.8/swig/python/Makefile.am     2006-10-06 12:48:44.095971000 +0200
-@@ -5,20 +5,15 @@
+       LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import $*'
+--- OpenIPMI-2.0.10/swig/python/Makefile.am.orig       2006-11-14 17:22:41.000000000 +0100
++++ OpenIPMI-2.0.10/swig/python/Makefile.am    2006-12-03 21:51:35.774843419 +0100
+@@ -5,46 +5,32 @@
            -I $(top_builddir) \
            -I $(top_builddir)/include \
            -I $(top_srcdir)/include \
@@ -22,29 +22,24 @@
 -CC = @CC@ -Wall
 -CFLAGS = @CFLAGS@ -fPIC -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@
 -DEFS = @DEFS@
-+pythonlibdir=$(PYTHON_INSTALL_DIR)
-+pythonlib_LTLIBRARIES = _OpenIPMI.la
-+_OpenIPMI_la_SOURCES = OpenIPMI_wrap.c
-+_OpenIPMI_la_LDFLAGS = -module -avoid-version
- 
+-
 -COMPILE = $(CC) $(DEFS) $(AM_CFLAGS) $(CFLAGS)
 -
 -all-local: _OpenIPMI.so
 -
 -OpenIPMI_SRC = OpenIPMI_wrap.c
 -OpenIPMI_OBJ = OpenIPMI_wrap.o
--
--OpenIPMI_LIB = @PYTHON_POSIX_LIB@ \
-+_OpenIPMI_la_LIBADD = @PYTHON_POSIX_LIB@ \
-              $(top_builddir)/lib/libOpenIPMI.la \
-              $(top_builddir)/utils/libOpenIPMIutils.la \
-              $(top_builddir)/cmdlang/libOpenIPMIcmdlang.la \
-@@ -26,31 +21,20 @@
++pythonlibdir=$(PYTHON_INSTALL_DIR)
++pythonlib_LTLIBRARIES = _OpenIPMI.la
++_OpenIPMI_la_SOURCES = OpenIPMI_wrap.c
++_OpenIPMI_la_LDFLAGS = -module -avoid-version
++  
++_OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS)
  
  EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py
  
 -_OpenIPMI.so: $(OpenIPMI_OBJ)
--      $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OpenIPMI_LIB) \
+-      $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OPENIPMI_SWIG_LIBS) \
 -              -R/$(libdir)
 -      rm _OpenIPMI.so
 -      mv .libs/_OpenIPMI.so .
@@ -65,7 +60,7 @@
        $(SWIG) $(DEFS) -python -o $@ -I$(top_srcdir)/swig/python $<
  
 -CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.so OpenIPMI_wrap.c \
-+CLEANFILES = OpenIPMI.lo _OpenIPMI.la OpenIPMI_wrap.c \
++CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.la OpenIPMI_wrap.c \
        OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
  
 -install-exec-local: _OpenIPMI.so OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
@@ -75,12 +70,12 @@
        $(INSTALL_PROGRAM) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
        $(INSTALL_PROGRAM) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
        $(INSTALL_PROGRAM) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
-@@ -66,7 +50,7 @@
+@@ -60,7 +46,7 @@
        rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo"
        rm -f "$(DESTDIR)$(bindir)/openipmigui"
  
--PYPATH=$(top_builddir)/swig/python
-+PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs
- PYLDPATH=$(top_builddir)/lib/.libs:$(top_builddir)/utils/.libs:$(top_builddir)/glib/.libs:$(top_builddir)/unix/.libs:$(top_builddir)/cmdlang/.libs:$(top_builddir)/tcl/.libs
+-PYPATH=$(top_builddir)/swig/python:$(srcdir)/openipmigui
++PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
  
  rungui:
+       LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py