From 316e7cd9cf0e6145f5fa1343e0f24a96775ed1ec Mon Sep 17 00:00:00 2001
From: Michael Schroeder <mls@suse.de>
Date: Mon, 18 Jul 2011 16:40:47 +0200
Subject: [PATCH] - fix build on 64bit and 11.3

---
 bindings/python/CMakeLists.txt | 8 +-------
 bindings/solv.i                | 6 ++++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 31a69c1..c34a310 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -1,12 +1,6 @@
 FIND_PACKAGE (PythonLibs)
 FIND_PACKAGE (PythonInterp REQUIRED)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR)
-
-IF (NOT PYTHON_SITEDIR)
-    SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR})
-ENDIF (NOT PYTHON_SITEDIR)
-
-SET (PYTHON_INSTALL_DIR ${PYTHON_SITEDIR})
+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
 
 MESSAGE (STATUS "Python executable: ${PYTHON_EXECUTABLE}")
 MESSAGE (STATUS "Python installation dir: ${PYTHON_INSTALL_DIR}")
diff --git a/bindings/solv.i b/bindings/solv.i
index 63b9eab..bf59ccb 100644
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -830,10 +830,12 @@ typedef struct {
   }
   %}
   void set_loadcallback(PyObject *callable) {
-    if ($self->loadcallback == loadcallback)
+    if ($self->loadcallback == loadcallback) {
       Py_DECREF($self->loadcallbackdata);
-    if (callable)
+    }
+    if (callable) {
       Py_INCREF(callable);
+    }
     pool_setloadcallback($self, callable ? loadcallback : 0, callable);
   }
 #endif
-- 
2.7.4