Hello community, here is the log from the commit of package konkretcmpi for openSUSE:Factory checked in at 2013-05-13 15:06:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-05 13:09:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes 2013-05-13 15:06:44.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 2 12:55:32 UTC 2013 - kkae...@suse.com + +- Enable using direct calls in KDefaultGetInstance + (enable-direct-call.patch) +- Fix method arguments that are both input and output + (konkretcmpi-0.9.0-fix-inputoutput-method-arguments.patch) +- Create -python subpackage (konkretcmpi python bindings) + +------------------------------------------------------------------- New: ---- enable-direct-call.patch konkretcmpi-0.9.0-fix-inputoutput-method-arguments.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konkretcmpi.spec ++++++ --- /var/tmp/diff_new_pack.mNn1bJ/_old 2013-05-13 15:06:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mNn1bJ/_new 2013-05-13 15:06:45.000000000 +0200 @@ -22,7 +22,9 @@ BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: python-devel BuildRequires: sblim-cmpi-devel +BuildRequires: swig Url: https://github.com/rnovacek/konkretcmpi # Increment the version every time the source code changes. Summary: A tool for developing CMPI providers in the C programming language @@ -38,6 +40,10 @@ Requires: sblim-cmpi-devel #Source0: https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz Source0: konkretcmpi-%{version}.tar.gz +# Enable using direct calls in KDefaultGetInstance (from upstream src rpm) +Patch1: enable-direct-call.patch +# Fix method arguments that are both input and output (from upstream src rpm) +Patch2: konkretcmpi-0.9.0-fix-inputoutput-method-arguments.patch %description An open-source tool for rapidly developing CMPI providers in the C @@ -54,9 +60,29 @@ %description devel Development files for konkretcmpi + +%package python +Summary: Python bindings for konkretcmpi +Group: Development/Libraries/Python +Requires: %{name} = %{version}-%{release} +%if 0%{?suse_version} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?py_requires: %define py_requires Requires: python} +%{py_requires} +%else +Requires: python2 +%endif + +%description python +This package contains python binding for konkretcmpi. + + %prep # Untar the sources. %setup -n konkretcmpi-%{version} +%patch1 -p1 +%patch2 -p1 %build rm -rf build @@ -73,9 +99,10 @@ -DPACKAGE_ARCHITECTURE=`uname -m` \ -DEXPLICIT_TARGET="$EXPLICIT_TARGET" \ -DLIB=%{_lib} \ + -DWITH_PYTHON=ON \ .. -%{__make} +CLFAGS="-DCIMSCHEMA=/usr/share/mof/cim-current" %{__make} %install cd build @@ -108,4 +135,9 @@ %{_bindir}/konkretreg %{_datadir}/cmake/Modules/* +%files python +%defattr(-,root,root) +%{python_sitearch}/*.so +%{python_sitearch}/*.py* + %changelog ++++++ enable-direct-call.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile ../orig-konkretcmpi-0.9.0/src/konkret/defaultgi.c ./src/konkret/defaultgi.c --- ../orig-konkretcmpi-0.9.0/src/konkret/defaultgi.c 2013-03-11 14:09:01.000000000 +0100 +++ ./src/konkret/defaultgi.c 2013-05-02 14:44:07.517751831 +0200 @@ -28,9 +28,7 @@ #define enumInstanceNames enumerateInstanceNames #include "konkret.h" -#if 0 # define DIRECT_CALL -#endif #if defined(DIRECT_CALL) ++++++ konkretcmpi-0.9.0-fix-inputoutput-method-arguments.patch ++++++ diff --git a/src/konkret/general.c b/src/konkret/general.c index 06f6d5a..96d07fc 100644 --- a/src/konkret/general.c +++ b/src/konkret/general.c @@ -423,10 +423,10 @@ CMPIStatus KBase_SetToArgs( cd = _data(value, pos.tag); - if ((pos.tag & KTAG_IN) && !in) - break;; + if (in && !(pos.tag & KTAG_IN)) + break; - if ((pos.tag & KTAG_OUT) && !out) + if (out && !(pos.tag & KTAG_OUT)) break; if (value->null) @@ -858,10 +858,10 @@ CMPIStatus KBase_FromArgs( if ((kv = _find_property(self, KChars(name), &tag))) { - if ((tag & KTAG_IN) && !in) + if (in && !(tag & KTAG_IN)) continue; - if ((tag & KTAG_OUT) && !out) + if (out && !(tag & KTAG_OUT)) continue; _set_value(kv, tag, &cd); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
