Hello community, here is the log from the commit of package konkretcmpi for openSUSE:Factory checked in at 2013-08-01 15:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-11 19:34:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes 2013-08-01 15:37:24.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Aug 1 07:49:34 UTC 2013 - kkae...@suse.com + +- Update to 0.9.1 + - Add support for embedded instances + - Support varlist in KReturn2 + - Fix return type for generated indication functions + - Enable direct calls + - Fix method arguments that are both input and output + +------------------------------------------------------------------- +Fri Jul 26 09:52:19 UTC 2013 - kkae...@suse.com + +- Fix build for SLE11 (old swig, old cmake) + Add swig-classic.patch + +------------------------------------------------------------------- Old: ---- fix-libkonkretmof-so-symlinks.patch konkretcmpi-0.9.0_35_g9729565.tar.gz New: ---- konkretcmpi-0.9.1.tar.gz swig-classic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konkretcmpi.spec ++++++ --- /var/tmp/diff_new_pack.xG0LaG/_old 2013-08-01 15:37:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xG0LaG/_new 2013-08-01 15:37:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: konkretcmpi -Version: 0.9.0_35_g9729565 +Version: 0.9.1 Release: 0 BuildRequires: cmake BuildRequires: gcc @@ -40,8 +40,10 @@ Requires: sblim-cmpi-devel #Source0: https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz Source0: konkretcmpi-%{version}.tar.gz -# Wrong symlinks for libkonkretmof, reported upstream, kkae...@suse.de -Patch1: fix-libkonkretmof-so-symlinks.patch +# SWIG/Python on SLE 11 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) +Patch2: swig-classic.patch %description An open-source tool for rapidly developing CMPI providers in the C @@ -79,7 +81,9 @@ %prep # Untar the sources. %setup -n konkretcmpi-%{version} -%patch1 -p1 +%if 0%{?suse_version} < 1120 +%patch2 -p1 +%endif %build rm -rf build ++++++ konkretcmpi-0.9.0_35_g9729565.tar.gz -> konkretcmpi-0.9.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konkretcmpi-0.9.0_35_g9729565/src/konkret/defaultgi.c new/konkretcmpi-0.9.1/src/konkret/defaultgi.c --- old/konkretcmpi-0.9.0_35_g9729565/src/konkret/defaultgi.c 2013-06-03 10:54:24.000000000 +0200 +++ new/konkretcmpi-0.9.1/src/konkret/defaultgi.c 2013-07-12 08:32:32.000000000 +0200 @@ -28,9 +28,7 @@ #define enumInstanceNames enumerateInstanceNames #include "konkret.h" -#if 0 -# define DIRECT_CALL -#endif +#define DIRECT_CALL #if defined(DIRECT_CALL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konkretcmpi-0.9.0_35_g9729565/src/konkret/konkret.h new/konkretcmpi-0.9.1/src/konkret/konkret.h --- old/konkretcmpi-0.9.0_35_g9729565/src/konkret/konkret.h 2013-06-03 10:54:24.000000000 +0200 +++ new/konkretcmpi-0.9.1/src/konkret/konkret.h 2013-07-12 08:32:32.000000000 +0200 @@ -27,6 +27,10 @@ #ifndef _konkret_h #define _konkret_h +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -2234,7 +2238,7 @@ { const unsigned char* sig = self ? self->__sig : NULL; - if (!KArray_Init((KArray*)self, cb, max, CMPI_ref)) + if (!KArray_Init((KArray*)self, cb, max, CMPI_instance)) { if (self) self->__sig = sig; @@ -2260,11 +2264,11 @@ KINLINE CMPIBoolean KInstanceA_Set( KInstanceA* self, CMPICount i, - CMPIObjectPath* x) + CMPIInstance* x) { const unsigned char* sig = self ? self->__sig : NULL; - if (!KArray_Set((KArray*)self, i, &x, CMPI_ref)) + if (!KArray_Set((KArray*)self, i, &x, CMPI_instance)) { if (self) self->__sig = sig; @@ -2281,7 +2285,7 @@ { const unsigned char* sig = self ? self->__sig : NULL; - if (!KArray_Null((KArray*)self, i, CMPI_ref)) + if (!KArray_Null((KArray*)self, i, CMPI_instance)) { if (self) self->__sig = sig; @@ -2299,7 +2303,7 @@ const unsigned char* sig = self ? self->__sig : NULL; KInstance result; - KArray_Get((KArray*)self, i, CMPI_ref, (KValue*)&result); + KArray_Get((KArray*)self, i, CMPI_instance, (KValue*)&result); if (self) self->__sig = sig; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konkretcmpi-0.9.0_35_g9729565/src/mof/CMakeLists.txt new/konkretcmpi-0.9.1/src/mof/CMakeLists.txt --- old/konkretcmpi-0.9.0_35_g9729565/src/mof/CMakeLists.txt 2013-06-03 10:54:24.000000000 +0200 +++ new/konkretcmpi-0.9.1/src/mof/CMakeLists.txt 2013-07-12 08:32:32.000000000 +0200 @@ -38,7 +38,8 @@ add_library(konkretmof SHARED ${konkretmof_SRCS}) -set_target_properties(konkretmof PROPERTIES SOVERSION 0.0.1) +set_target_properties(konkretmof PROPERTIES VERSION 0.0.1) +set_target_properties(konkretmof PROPERTIES SOVERSION 0) install(TARGETS konkretmof DESTINATION lib${LIB_SUFFIX}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konkretcmpi-0.9.0_35_g9729565/src/mof/MOF_Class_Decl.cpp new/konkretcmpi-0.9.1/src/mof/MOF_Class_Decl.cpp --- old/konkretcmpi-0.9.0_35_g9729565/src/mof/MOF_Class_Decl.cpp 2013-06-03 10:54:24.000000000 +0200 +++ new/konkretcmpi-0.9.1/src/mof/MOF_Class_Decl.cpp 2013-07-12 08:32:32.000000000 +0200 @@ -644,6 +644,9 @@ MOF_warning_printf("EmbeddedInstance qualifier allowed " "only on string properties: %s.%s", name, prop->name); } + // EmbeddedInstance has type string, but we want to work + // with it as Instance + prop->data_type = TOK_INSTANCE; } else if (p->type == MOF_FEATURE_METHOD) { @@ -654,6 +657,9 @@ MOF_warning_printf("EmbeddedInstance qualifier allowed " "only on string properties: %s.%s", name, meth->name); } + // EmbeddedInstance has type string, but we want to work + // with it as Instance + meth->data_type = TOK_INSTANCE; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konkretcmpi-0.9.0_35_g9729565/src/program/main.cpp new/konkretcmpi-0.9.1/src/program/main.cpp --- old/konkretcmpi-0.9.0_35_g9729565/src/program/main.cpp 2013-06-03 10:54:24.000000000 +0200 +++ new/konkretcmpi-0.9.1/src/program/main.cpp 2013-07-12 08:32:32.000000000 +0200 @@ -247,6 +247,13 @@ recursive_dependencies(p->ref_name, deps); } } + else if (p->qualifiers->has_key("EmbeddedInstance")) + { + char *name = p->qualifiers->get("EmbeddedInstance")->params->string_value; + if (!contains(deps, name)) { + recursive_dependencies(name, deps); + } + } } continue; } @@ -299,6 +306,8 @@ return "CMPIString*"; case TOK_DATETIME: return "CMPIDateTime*"; + case TOK_INSTANCE: + return "CMPIInstance*"; } // Unreachable @@ -340,6 +349,8 @@ return "KDateTime"; case TOK_REF: return "KRef"; + case TOK_INSTANCE: + return "KInstance"; } // Unreachable @@ -403,6 +414,9 @@ case TOK_REF: tag = KTYPE_REFERENCE; break; + case TOK_INSTANCE: + tag = KTYPE_INSTANCE; + break; } if (array) @@ -472,10 +486,19 @@ if (ref && !key) continue; - if (pd->array_index == 0) - put(os, " const $0 $1;\n", ktn, pn, NULL); + if (pd->qualifiers->has_key("EmbeddedInstance")) { + if (pd->array_index) + put(os, " const KInstanceA $0;\n", pn, NULL); + else + put(os, " const KInstance $0;\n", pn, NULL); + } else - put(os, " const $0A $1;\n", ktn, pn, NULL); + { + if (pd->array_index == 0) + put(os, " const $0 $1;\n", ktn, pn, NULL); + else + put(os, " const $0A $1;\n", ktn, pn, NULL); + } // Add sig entry [type][length][name][zero-terminator] @@ -612,10 +635,19 @@ { const char* ktn = _ktype_name(p->data_type); - if (p->array_index) - put(os, " $0A $1;\n", ktn, p->name, NULL); + if (p->qualifiers->has_key("EmbeddedInstance")) { + if (p->array_index) + put(os, " KInstanceA $0;\n", p->name, NULL); + else + put(os, " KInstance $0;\n", p->name, NULL); + } else - put(os, " $0 $1;\n", ktn, p->name, NULL); + { + if (p->array_index) + put(os, " $0A $1;\n", ktn, p->name, NULL); + else + put(os, " $0 $1;\n", ktn, p->name, NULL); + } } pack_tag(sig, tag); @@ -854,11 +886,17 @@ else { const char* ktn = _ktype_name(p->data_type); - - if (p->array_index) - put(os, " $0$1A* $2,\n", mod, ktn, p->name, NULL); - else - put(os, " $0$1* $2,\n", mod, ktn, p->name, NULL); + if (p->qualifiers->has_key("EmbeddedInstance")) { + if (p->array_index) + put(os, " $0KInstanceA* $1,\n", mod, p->name, NULL); + else + put(os, " $0KInstance* $1,\n", mod, p->name, NULL); + } else { + if (p->array_index) + put(os, " $0$1A* $2,\n", mod, ktn, p->name, NULL); + else + put(os, " $0$1* $2,\n", mod, ktn, p->name, NULL); + } } } ++++++ swig-classic.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.0_35_g9729565/src/mof/python/CMakeLists.txt ./src/mof/python/CMakeLists.txt --- ../orig-konkretcmpi-0.9.0_35_g9729565/src/mof/python/CMakeLists.txt 2013-06-03 10:54:24.000000000 +0200 +++ ./src/mof/python/CMakeLists.txt 2013-07-26 11:51:20.315921312 +0200 @@ -6,15 +6,16 @@ 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}/..) +include_directories(${PYTHON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. "/usr/include/python2.6") 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 lib${LIB_SUFFIX}/python2.6/site-packages) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION lib${LIB_SUFFIX}/python2.6/site-packages) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
