Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2015-02-18 11:39:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-02-10
20:23:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2015-02-18 12:09:24.000000000 +0100
@@ -6 +6,2 @@
-- fix konkretmof.so name (SUSE cmake bug)
+- add older-cmake.patch to build with older cmake versions
+- fix konkretmof.so name (Factory cmake bug)
New:
----
older-cmake.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ konkretcmpi.spec ++++++
--- /var/tmp/diff_new_pack.WeBBtc/_old 2015-02-18 12:09:24.000000000 +0100
+++ /var/tmp/diff_new_pack.WeBBtc/_new 2015-02-18 12:09:24.000000000 +0100
@@ -36,18 +36,20 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source0:
https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz
Source0: konkretcmpi-%{version}.tar.gz
-# SWIG/Python on SLE 11 and below needs -classic switch, kkae...@suse.de
-# 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)
-# CMake on SLE10 defines PYTHON_INCLUDE_PATH, not PYTHON_INCLUDE_DIR,
kkae...@suse.de
-# CMake on SLE10 does not define PYTHON_VER, kkae...@suse.de
-Patch1: sle10.patch
+# PATCH-FIX-OPENSUSE, kkae...@suse.de
+# Adapt for older cmake versions
+Patch1: older-cmake.patch
# PATCH-FIX-UPSTREAM
# Fix for cim-schema 2.40.0 compatiblity
# See https://github.com/rnovacek/konkretcmpi/issues/3
Patch2: 0001-Honor-that-string-properties-with-EmbeddedInstance-q.patch
# PATCH-FIX-UPSTREAM
Patch3: konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
+# SWIG/Python on SLE 11 and below needs -classic switch, kkae...@suse.de
+# 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)
+# CMake on SLE10 defines PYTHON_INCLUDE_PATH, not PYTHON_INCLUDE_DIR,
kkae...@suse.de
+Patch4: sle10.patch
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -98,7 +100,18 @@
%prep
# Untar the sources.
%setup -n konkretcmpi-%{version}
-%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1020
+%if 0%{?suse_version} > 0
+%if 0%{?suse_version} < 1320
+%patch1 -p1
+%if 0%{?suse_version} < 1020
+%patch4 -p1
+%endif
+%endif
+%endif
+%if 0%{?rhel_version} > 0 && 0%{?rhel_version} < 700
+%patch1 -p1
+%endif
+%if 0%{?centos_version} > 0 && 0%{?centos_version} < 700
%patch1 -p1
%endif
%patch2 -p1
@@ -127,7 +140,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install/fast -C build
# Argh, Fedora cmake and SUSE cmake differ :-/
-%if 0%{?suse_version}
+%if 0%{?suse_version} > 1320
mv %{buildroot}%{python_sitearch}/__konkretmof.so
%{buildroot}%{python_sitearch}/_konkretmof.so
%endif
# Don't package .la object
++++++ older-cmake.patch ++++++
diff --git a/src/mof/python/CMakeLists.txt b/src/mof/python/CMakeLists.txt
index ea887daa753d..b2ef4241ef38 100644
--- a/src/mof/python/CMakeLists.txt
+++ b/src/mof/python/CMakeLists.txt
@@ -4,17 +4,24 @@ include(${SWIG_USE_FILE})
set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4)
find_package(PythonLibs REQUIRED)
+FIND_PACKAGE(PythonInterp 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_EXECUTABLE} -c "from distutils.sysconfig
import get_python_lib; print get_python_lib(1)" OUTPUT_VARIABLE PYTHON_LIB_DIR)
+STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}")
+
+include_directories(${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+MESSAGE(STATUS "Python include: ${PYTHON_INCLUDE_PATH}")
+MESSAGE(STATUS "Python lib: ${PYTHON_LIB_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")
swig_add_module(konkretmof python
konkretmof.i)
swig_link_libraries(konkretmof ${PYTHON_LIBRARIES} 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_LIB_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION
${PYTHON_LIB_DIR})
diff --git a/src/mof/python/konkretmof.i b/src/mof/python/konkretmof.i
index f0901713bbe3..30ec6820c293 100644
--- a/src/mof/python/konkretmof.i
+++ b/src/mof/python/konkretmof.i
@@ -15,6 +15,7 @@
#include "MOF_Types.h"
%}
+%include "MOF_Config.h"
%include "MOF_Parser.h"
%include "MOF_Types.h"
++++++ sle10.patch ++++++
--- /var/tmp/diff_new_pack.WeBBtc/_old 2015-02-18 12:09:24.000000000 +0100
+++ /var/tmp/diff_new_pack.WeBBtc/_new 2015-02-18 12:09:25.000000000 +0100
@@ -1,29 +1,12 @@
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)
-+MESSAGE(STATUS, "Lib ${PYTHON_LIB_DIR}, Arch ${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)
+--- ../orig-konkretcmpi-0.9.2/src/mof/python/CMakeLists.txt 2015-02-09
19:52:50.476210650 +0100
++++ ./src/mof/python/CMakeLists.txt 2015-02-09 19:53:59.835087289 +0100
+@@ -21,7 +21,7 @@
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})
+ install(TARGETS ${SWIG_MODULE_konkretmof_REAL_NAME} DESTINATION
${PYTHON_LIB_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION
${PYTHON_LIB_DIR})
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
