tr8lina / rpms / OpenIPMI

Forked from rpms/OpenIPMI 2 years ago
Clone

Blame SOURCES/0003-Python3.patch

2dface
diff -urNp a/configure b/configure
2dface
--- a/configure	2018-04-17 08:47:58.528284066 +0200
2dface
+++ b/configure	2018-04-17 10:00:24.091372864 +0200
2dface
@@ -13406,7 +13406,7 @@ if test "x$pythoncflags" = "x" -o "x$pyt
2dface
    pythonprog=
2dface
    if test "x$trypython" != "xno"; then
2dface
       # Extract the first word of "python", so it can be a program name with args.
2dface
-set dummy python; ac_word=$2
2dface
+set dummy python3; ac_word=$2
2dface
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2dface
 $as_echo_n "checking for $ac_word... " >&6; }
2dface
 if ${ac_cv_path_pythonprog+:} false; then :
2dface
@@ -13500,12 +13500,12 @@ if test "x$pythonprog" != "x"; then
2dface
    if test "x$pythonusepthreads" = "x"; then
2dface
       cat - <<_ACEOF >conftest.py
2dface
 try:
2dface
-  import thread
2dface
+  import threading
2dface
   print('yes')
2dface
 except:
2dface
   print('no')
2dface
 _ACEOF
2dface
-      pythonusepthreads=`python conftest.py`
2dface
+      pythonusepthreads=`python3 conftest.py`
2dface
       rm -f conftest.py
2dface
    fi
2dface
    echo "checking for python threads... $pythonusepthreads"
2dface
@@ -13537,7 +13537,7 @@ try:
2dface
 except:
2dface
   print('no')
2dface
 _ACEOF
2dface
-      tkinter=`python conftest.py`
2dface
+      tkinter=`python3 conftest.py`
2dface
       rm -f conftest.py
2dface
    fi
2dface
 fi
2dface
diff -urNp a/configure.ac b/configure.ac
2dface
--- a/configure.ac	2018-04-17 08:47:58.529284062 +0200
2dface
+++ b/configure.ac	2018-04-17 10:01:02.115576922 +0200
2dface
@@ -526,7 +526,7 @@ AC_SUBST(PERL_POSIX_SO)
2dface
 if test "x$pythoncflags" = "x" -o "x$pythoninstalldir" = "x"; then
2dface
    pythonprog=
2dface
    if test "x$trypython" != "xno"; then
2dface
-      AC_PATH_PROG(pythonprog, python)
2dface
+      AC_PATH_PROG(pythonprog, python3)
2dface
    fi
2dface
    if test "x$pythonprog" != "x"; then
2dface
       # Now find a proper installation location.
2dface
@@ -578,12 +578,12 @@ if test "x$pythonprog" != "x"; then
2dface
    if test "x$pythonusepthreads" = "x"; then
2dface
       cat - <<_ACEOF >conftest.py
2dface
 try:
2dface
-  import thread
2dface
+  import threading
2dface
   print('yes')
2dface
 except:
2dface
   print('no')
2dface
 _ACEOF
2dface
-      pythonusepthreads=`python conftest.py`
2dface
+      pythonusepthreads=`python3 conftest.py`
2dface
       rm -f conftest.py
2dface
    fi
2dface
    echo "checking for python threads... $pythonusepthreads"
2dface
@@ -615,7 +615,7 @@ try:
2dface
 except:
2dface
   print('no')
2dface
 _ACEOF
2dface
-      tkinter=`python conftest.py`
2dface
+      tkinter=`python3 conftest.py`
2dface
       rm -f conftest.py
2dface
    fi
2dface
 fi
2dface
diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am
2dface
--- a/swig/python/Makefile.am	2018-04-17 08:47:58.547283986 +0200
2dface
+++ b/swig/python/Makefile.am	2018-04-17 14:43:01.703963727 +0200
2dface
@@ -22,19 +22,14 @@ EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h
2dface
 OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la
2dface
 	-PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py'
2dface
 
2dface
-OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la
2dface
-	-PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py'
2dface
-
2dface
 OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
2dface
	$(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $<
2dface
 
2dface
-CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
2dface
+CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py
2dface
 
2dface
-install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
2dface
+install-exec-local: _OpenIPMI.la OpenIPMI.py
2dface
 	$(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
2dface
 	$(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
2dface
-	$(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
2dface
-	$(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
2dface
 	if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \
2dface
 	    $(INSTALL) -d $(DESTDIR)$(bindir); \
2dface
 	    $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\
2dface
@@ -43,8 +38,6 @@ install-exec-local: _OpenIPMI.la OpenIPM
2dface
 uninstall-local:
2dface
 	$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/_OpenIPMI.so"
2dface
 	rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.py"
2dface
-	rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyc"
2dface
-	rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo"
2dface
 	rm -f "$(DESTDIR)$(bindir)/openipmigui"
2dface
 
2dface
 rungui:
2dface
diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in
2dface
--- a/swig/python/Makefile.in	2018-04-17 08:47:58.547283986 +0200
2dface
+++ b/swig/python/Makefile.in	2018-04-17 14:43:28.969899859 +0200
2dface
@@ -443,7 +443,7 @@ nodist__OpenIPMI_la_SOURCES = OpenIPMI_w
2dface
 _OpenIPMI_la_LDFLAGS = -module -avoid-version
2dface
 _OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) $(PYTHON_POSIX_LIB)
2dface
 EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py sample.py sample2.py
2dface
-CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
2dface
+CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py
2dface
 all: all-recursive
2dface
 
2dface
 .SUFFIXES:
2dface
@@ -837,20 +837,12 @@ uninstall-am: uninstall-local uninstall-
2dface
 .PRECIOUS: Makefile
2dface
 
2dface
 
2dface
-OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la
2dface
-	-PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py'
2dface
-
2dface
-OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la
2dface
-	-PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py'
2dface
-
2dface
 OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
2dface
	$(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $<
2dface
 
2dface
-install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
2dface
+install-exec-local: _OpenIPMI.la OpenIPMI.py
2dface
 	$(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
2dface
 	$(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
2dface
-	$(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
2dface
-	$(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
2dface
 	if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \
2dface
 	    $(INSTALL) -d $(DESTDIR)$(bindir); \
2dface
 	    $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\
2dface
@@ -859,8 +851,6 @@ install-exec-local: _OpenIPMI.la OpenIPM
2dface
 uninstall-local:
2dface
 	$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/_OpenIPMI.so"
2dface
 	rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.py"
2dface
-	rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyc"
2dface
-	rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo"
2dface
 	rm -f "$(DESTDIR)$(bindir)/openipmigui"
2dface
 
2dface
 rungui: