Hello community, here is the log from the commit of package konkretcmpi for openSUSE:Factory checked in at 2015-02-10 20:23:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-02 13:58:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes 2015-02-10 20:23:30.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Feb 9 16:57:04 UTC 2015 - kkae...@suse.com + +- add upstream patch + konkretcmpi-0.9.2-fix-returning-instance-from-method.patch +- fix konkretmof.so name (SUSE cmake bug) +- fix konkretcmpi-python file path +- apply sle10.patch on SLE10 only + +------------------------------------------------------------------- +Mon Feb 2 10:58:11 UTC 2015 - kkae...@suse.com + +- fix rhel6 build + +------------------------------------------------------------------- New: ---- konkretcmpi-0.9.2-fix-returning-instance-from-method.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konkretcmpi.spec ++++++ --- /var/tmp/diff_new_pack.1Fay8z/_old 2015-02-10 20:23:31.000000000 +0100 +++ /var/tmp/diff_new_pack.1Fay8z/_new 2015-02-10 20:23:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package konkretcmpi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -46,6 +46,8 @@ # 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 %description An open-source tool for rapidly developing CMPI providers in the C @@ -57,8 +59,8 @@ %package -n %{libsoname} Summary: Shared library of konkretcmpi Group: System/Libraries -Provides: %{name} <= %{version} -Obsoletes: %{name} <= %{version} +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} %description -n %{libsoname} This package contains the shared libkonkrekcmpi library. @@ -96,10 +98,11 @@ %prep # Untar the sources. %setup -n konkretcmpi-%{version} -%if 0%{?suse_version} && 0%{?suse_version} < 1120 +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1020 %patch1 -p1 %endif %patch2 -p1 +%patch3 -p1 %build rm -rf build @@ -123,6 +126,10 @@ %install make DESTDIR=$RPM_BUILD_ROOT install/fast -C build +# Argh, Fedora cmake and SUSE cmake differ :-/ +%if 0%{?suse_version} +mv %{buildroot}%{python_sitearch}/__konkretmof.so %{buildroot}%{python_sitearch}/_konkretmof.so +%endif # Don't package .la object rm -rf $RPM_BUILD_ROOT/usr/lib*/libkonkret.la @@ -152,6 +159,10 @@ %files python %defattr(-,root,root) %{python_sitearch}/*.so +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1020 +%{python_sitelib}/*.py* +%else %{python_sitearch}/*.py* +%endif %changelog ++++++ konkretcmpi-0.9.2-fix-returning-instance-from-method.patch ++++++ commit aca6c7f910ffe9930b5789969f0adfadd668bb46 Author: Michal Minar <mimi...@redhat.com> Date: Fri Jun 20 10:50:45 2014 +0200 Fix returning instance as an output argument from method Submitted By: Radek Novacek <rnova...@redhat.com> diff --git a/src/program/main.cpp b/src/program/main.cpp index 885dc12..9e7108a 100644 --- a/src/program/main.cpp +++ b/src/program/main.cpp @@ -506,7 +506,11 @@ static void gen_feature_decls( // Add sig entry [type][length][name][zero-terminator] - KTag tag = _ktag(pd->data_type, pd->array_index, key, false, false); + KTag tag; + if (pd->qualifiers->has_key("EmbeddedInstance")) + tag = _ktag(TOK_INSTANCE, pd->array_index, key, false, false); + else + tag = _ktag(pd->data_type, pd->array_index, key, false, false); pack_tag(sig, tag); pack_name(sig, pd->name); count++; @@ -640,6 +644,7 @@ static void gen_param(FILE* os, MOF_Parameter* p, vector<unsigned char>& sig) const char* ktn = _ktype_name(p->data_type); if (p->qualifiers->has_key("EmbeddedInstance")) { + tag = _ktag(TOK_INSTANCE, p->array_index, false, in, out); if (p->array_index) put(os, " KInstanceA $0;\n", p->name, NULL); else ++++++ sle10.patch ++++++ --- /var/tmp/diff_new_pack.1Fay8z/_old 2015-02-10 20:23:31.000000000 +0100 +++ /var/tmp/diff_new_pack.1Fay8z/_new 2015-02-10 20:23:31.000000000 +0100 @@ -10,7 +10,7 @@ -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++") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
