Hello community, here is the log from the commit of package konkretcmpi for openSUSE:Factory checked in at 2014-02-02 22:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konkretcmpi (Old) and /work/SRC/openSUSE:Factory/.konkretcmpi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konkretcmpi" Changes: -------- --- /work/SRC/openSUSE:Factory/konkretcmpi/konkretcmpi.changes 2013-10-25 11:10:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes 2014-02-02 22:19:35.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 17 11:13:42 UTC 2014 - [email protected] + +- Fix python install pathes (esp. fixes SLE10 build) + swig-classic.patch renamed to sle10.patch + +------------------------------------------------------------------- Old: ---- swig-classic.patch New: ---- sle10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konkretcmpi.spec ++++++ --- /var/tmp/diff_new_pack.BgwHUA/_old 2014-02-02 22:19:36.000000000 +0100 +++ /var/tmp/diff_new_pack.BgwHUA/_new 2014-02-02 22:19:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package konkretcmpi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,10 +40,12 @@ Requires: sblim-cmpi-devel #Source0: https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz Source0: konkretcmpi-%{version}.tar.gz -# SWIG/Python on SLE 11 needs -classic switch, [email protected] +# SWIG/Python on SLE 11 and below needs -classic switch, [email protected] # See http://stackoverflow.com/questions/14192288/how-to-make-multiple-properties-valid-to-one-file-by-set-source-files-properties # why set_source_files_properties cannot be used (recognizes string as single property) -Patch2: swig-classic.patch +# CMake on SLE10 defines PYTHON_INCLUDE_PATH, not PYTHON_INCLUDE_DIR, [email protected] +# CMake on SLE10 does not define PYTHON_VER, [email protected] +Patch1: sle10.patch %description An open-source tool for rapidly developing CMPI providers in the C @@ -81,8 +83,8 @@ %prep # Untar the sources. %setup -n konkretcmpi-%{version} -%if 0%{?suse_version} < 1120 -%patch2 -p1 +%if 0%{?suse_version} && 0%{?suse_version} < 1120 +%patch1 -p1 %endif %build ++++++ sle10.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-konkretcmpi-0.9.2/src/mof/python/CMakeLists.txt ./src/mof/python/CMakeLists.txt --- ../orig-konkretcmpi-0.9.2/src/mof/python/CMakeLists.txt 2013-09-25 14:36:56.000000000 +0200 +++ ./src/mof/python/CMakeLists.txt 2014-01-17 12:12:09.016410545 +0100 @@ -4,17 +4,20 @@ set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4) find_package(PythonLibs REQUIRED) -string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" PYTHON_VER "${PYTHONLIBS_VERSION_STRING}") -include_directories(${PYTHON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..) +EXECUTE_PROCESS(COMMAND "python" -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR) +EXECUTE_PROCESS(COMMAND "python" -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_ARCH_DIR) + +include_directories(${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/..) set(CMAKE_SWIG_FLAGS "-c++") set_source_files_properties(konkretmof.i PROPERTIES CPLUSPLUS ON) set_source_files_properties(konkretmof.i PROPERTIES SWIG_FLAGS "-includeall") +set_property(SOURCE konkretmof.i APPEND PROPERTY SWIG_FLAGS "-classic") swig_add_module(konkretmof python konkretmof.i) -swig_link_libraries(konkretmof ${PYTHON_LIBRARIES} konkretmof) +swig_link_libraries(konkretmof ${PYTHON_LIBRARIES} pthread util dl konkretmof) -install(TARGETS ${SWIG_MODULE_konkretmof_REAL_NAME} DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VER}/site-packages) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VER}/site-packages) +install(TARGETS ${SWIG_MODULE_konkretmof_REAL_NAME} DESTINATION ${PYTHON_ARCH_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION ${PYTHON_LIB_DIR}) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
