commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2020-05-07 14:53:16
Comparing /work/SRC/openSUSE:Factory/konkretcmpi (Old)
and /work/SRC/openSUSE:Factory/.konkretcmpi.new.2738 (New)
Package is "konkretcmpi"
Thu May 7 14:53:16 2020 rev:32 rq:800696 version:0.9.2
Changes:
--- /work/SRC/openSUSE:Factory/konkretcmpi/konkretcmpi.changes 2016-07-21
08:18:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new.2738/konkretcmpi.changes
2020-05-07 14:53:28.258188394 +0200
@@ -1,0 +2,5 @@
+Fri May 1 10:23:49 UTC 2020 - Klaus Kämpf
+
+- build -python3 subpackage for openSUSE Leap 15 and later.
+
+---
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.hdvDDr/_old 2020-05-07 14:53:29.634190807 +0200
+++ /var/tmp/diff_new_pack.hdvDDr/_new 2020-05-07 14:53:29.638190814 +0200
@@ -1,7 +1,7 @@
#
# spec file for package konkretcmpi
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,10 +12,22 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+# 1 for python3, 0 for python2
+%if 0%{?suse_version} >= 1500
+%define python3 1
+%else
+%define python3 0
+%endif
+%if %{python3}
+%define pythonpackagename python3
+%else
+%define pythonpackagename python
+%endif
+
Name: konkretcmpi
%define libname lib%{name}
%define libsoname %{libname}0
@@ -24,15 +36,19 @@
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
+%if %{python3}
+BuildRequires: python3-devel
+%else
BuildRequires: python-devel
+%endif
BuildRequires: sblim-cmpi-devel
BuildRequires: swig
-Url:https://github.com/rnovacek/konkretcmpi
+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
+# This is necessary to build the RPM as a non-root user.
License:MIT
Group: Development/Libraries/C and C++
-# This is necessary to build the RPM as a non-root user.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source0:
https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz
Source0:konkretcmpi-%{version}.tar.gz
@@ -93,19 +109,24 @@
definitions and by providing default implementations for many of the
provider operations.
-%package python
+%package %{pythonpackagename}
Summary:Python bindings for konkretcmpi
Group: Development/Libraries/Python
%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}
+%if %{python3}
+%{!?py_requires: %define py_requires Requires: python3}
+%else
+%{!?py_requires: %define py_requires Requires: python}
+%endif
%{py_requires}
%else
Requires: python2
%endif
-%description python
+%description %{pythonpackagename}
This package contains python binding for konkretcmpi.
@@ -169,7 +190,8 @@
%defattr(-,root,root)
%{_libdir}/libkonkret.so.*
%{_libdir}/libkonkretmof.so.*
-%doc README COPYING
+%doc README
+%license COPYING
%files devel
%defattr(-,root,root)
@@ -181,13 +203,17 @@
%{_bindir}/konkretreg
%{_datadir}/cmake/Modules/*
-%files python
+%files %{pythonpackagename}
%defattr(-,root,root)
%{python_sitearch}/*.so
%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1020
%{python_sitelib}/*.py*
%else
+%if %{python3}
%{python_sitearch}/*.py*
+%else
+%{python2_sitearch}/*.py*
+%endif
%endif
%changelog
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2016-07-21 08:18:06
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 2016-03-26
17:29:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2016-07-21 08:18:09.0 +0200
@@ -1,0 +2,11 @@
+Tue Jul 19 12:02:54 UTC 2016 - mvet...@suse.com
+
+- boo#985179 openlmi-providers fails to build
+- boo#985247 openlmi-networking fails to build
+- Fix build with gcc6.
+ openlmi-providers uses konkretcmpi. If both are build with gcc6
+ konkretcmpi segfaulted.
+- Add konkretcmpi-0.9.2-fix-segfault-mofelement.patch
+- Add -fno-delete-null-pointer-checks to CXXFlags and CFLags
+
+---
New:
konkretcmpi-0.9.2-fix-segfault-mofelement.patch
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.YcOacm/_old 2016-07-21 08:18:10.0 +0200
+++ /var/tmp/diff_new_pack.YcOacm/_new 2016-07-21 08:18:10.0 +0200
@@ -49,6 +49,9 @@
Patch4: 0004-Fix-missing-rpath.patch
# PATCH-FIX-UPSTREAM
Patch5: 0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
+# PATCH-FIX-UPSTREAM
+# stolen from Fedora
+Patch8: konkretcmpi-0.9.2-fix-segfault-mofelement.patch
# PATCH-FIX-OPENSUSE, kkae...@suse.de
# Adapt for older cmake versions
@@ -128,6 +131,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch8 -p1
%build
rm -rf build
@@ -138,8 +142,8 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fstack-protector" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fstack-protector" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fstack-protector
-fno-delete-null-pointer-checks" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fstack-protector
-fno-delete-null-pointer-checks" \
-DCMAKE_SKIP_RPATH=1 \
-DPACKAGE_ARCHITECTURE=`uname -m` \
-DEXPLICIT_TARGET="$EXPLICIT_TARGET" \
++ konkretcmpi-0.9.2-fix-segfault-mofelement.patch ++
diff --git a/src/mof/MOF_Qualifier.cpp b/src/mof/MOF_Qualifier.cpp
index ac695f6..ff6a3fe 100644
--- a/src/mof/MOF_Qualifier.cpp
+++ b/src/mof/MOF_Qualifier.cpp
@@ -137,7 +137,10 @@ void MOF_Qualifier::validate()
qual_decl->array_index == 0 &&
(params == 0 || params->value_type == TOK_NULL_VALUE))
{
-params->delete_list();
+if (params != 0)
+{
+params->delete_list();
+}
params = new MOF_Literal();
params->value_type = TOK_BOOL_VALUE;
params->bool_value = true;
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2016-03-26 15:29:27
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-08-05
06:52:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2016-03-26 17:29:09.0 +0100
@@ -1,0 +2,15 @@
+Fri Mar 18 13:22:32 UTC 2016 - kkae...@suse.com
+
+- sync patches with upstream
+
+ * rename
+ 0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
+ to 0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
+ konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
+ to 0003-Fix-returning-instance-as-an-output-argument-from-me.patch
+
+ * add
+ 0002-Don-t-optimize-out-module-registration.patch
+ 0004-Fix-missing-rpath.patch
+
+---
Old:
0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
New:
0002-Don-t-optimize-out-module-registration.patch
0003-Fix-returning-instance-as-an-output-argument-from-me.patch
0004-Fix-missing-rpath.patch
0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.9UHunm/_old 2016-03-26 17:29:10.0 +0100
+++ /var/tmp/diff_new_pack.9UHunm/_new 2016-03-26 17:29:10.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package konkretcmpi
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,22 +36,29 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source0:
https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz
Source0:konkretcmpi-%{version}.tar.gz
-# 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
+Patch1: 0001-Honor-that-string-properties-with-EmbeddedInstance-q.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0002-Don-t-optimize-out-module-registration.patch
+# PATCH-FIX-UPSTREAM
+Patch3: 0003-Fix-returning-instance-as-an-output-argument-from-me.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
+Patch4: 0004-Fix-missing-rpath.patch
+# PATCH-FIX-UPSTREAM
+Patch5: 0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
+
+# PATCH-FIX-OPENSUSE, kkae...@suse.de
+# Adapt for older cmake versions
+Patch6: older-cmake.patch
+
+# PATCH-FIX-OPENSUSE, 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
-# PATCH-FIX-UPSTREAM
-Patch5: 0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
+Patch7: sle10.patch
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -67,7 +74,7 @@
Obsoletes: %{name} < %{version}
%description -n %{libsoname}
-This package contains the shared libkonkrekcmpi library.
+This package contains the shared libkonkretcmpi library.
%package devel
Summary:Development files for konkretcmpi
@@ -104,20 +111,22 @@
%setup -n konkretcmpi-%{version}
%if 0%{?suse_version} > 0
%if 0%{?suse_version} < 1320
-%patch1 -p1
+%patch6 -p1
%if 0%{?suse_version} < 1020
-%patch4 -p1
+%patch7 -p1
%endif
%endif
%endif
%if 0%{?rhel_version} > 0 && 0%{?rhel_version} < 700
-%patch1 -p1
+%patch6 -p1
%endif
%if 0%{?centos_version} > 0 && 0%{?centos_version} < 700
-%patch1 -p1
+%patch6 -p1
%endif
+%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%patch5 -p1
%build
++ 0002-Don-t-optimize-out-module-registration.patch ++
>From 63746931efdc064a49e3f4f2fa3cd66609facd8f Mon Sep 17 00:00:00 2001
From: Radek Novacek
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2015-08-05 06:52:12
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-03-27
09:41:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2015-08-05 06:52:13.0 +0200
@@ -1,0 +2,9 @@
+Tue Aug 4 13:28:46 UTC 2015 - kkae...@suse.com
+
+- add 0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
+ On some systems the KONKRET_REGISTRATION macro definition gets
+ compiled into the provider library and then konkretreg generates
+ incorrect registration file. This commit adds a check for this
+ case.
+
+---
New:
0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.puqBNs/_old 2015-08-05 06:52:14.0 +0200
+++ /var/tmp/diff_new_pack.puqBNs/_new 2015-08-05 06:52:14.0 +0200
@@ -50,6 +50,8 @@
# 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
+# PATCH-FIX-UPSTREAM
+Patch5: 0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -116,6 +118,7 @@
%endif
%patch2 -p1
%patch3 -p1
+%patch5 -p1
%build
rm -rf build
++ 0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch ++
From 4934aad4dca4ef0ec493b7871028f94a7bbfc0f0 Mon Sep 17 00:00:00 2001
From: Radek Novacek rnova...@redhat.com
Date: Tue, 4 Aug 2015 12:31:51 +0200
Subject: [PATCH] konkretreg: ignore KONKRET_REGISTRATION macro in library
On some systems the KONKRET_REGISTRATION macro definition gets
compiled into the provider library and then konkretreg generates
incorrect registration file. This commit adds a check for this
case.
Fixes #6.
---
src/konkretreg/main.cpp | 9 +
1 file changed, 9 insertions(+)
diff --git a/src/konkretreg/main.cpp b/src/konkretreg/main.cpp
index 9b0f323728e4..bba47affc86e 100644
--- a/src/konkretreg/main.cpp
+++ b/src/konkretreg/main.cpp
@@ -180,6 +180,15 @@ int main(int argc, char** argv)
{
if (memcmp(p, REG, sizeof(REG)-1) == 0)
{
+if (n 0 *(p - 1) == '')
+{
+// Some systems generate entry for the macro itself, we're not
+// interested in it. There is a doublequote sign before name
+// of the entry.
+p++;
+n--;
+continue;
+}
char buf[4096];
size_t r = strlen(p) + 1;
--
2.1.4
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2015-03-27 09:41:17
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-18
12:09:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2015-03-27 09:41:18.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 26 07:26:48 UTC 2015 - kkae...@suse.com
+
+- back out konkretmof.so name fix
+
+---
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.aexgvf/_old 2015-03-27 09:41:18.0 +0100
+++ /var/tmp/diff_new_pack.aexgvf/_new 2015-03-27 09:41:18.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package konkretcmpi
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -139,10 +139,6 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install/fast -C build
-# Argh, Fedora cmake and SUSE cmake differ :-/
-%if 0%{?suse_version} 1320
-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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit konkretcmpi for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2015-02-18 12:09:24.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.WeBBtc/_new 2015-02-18 12:09:24.0 +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
commit konkretcmpi for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2015-02-10 20:23:30.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.1Fay8z/_new 2015-02-10 20:23:31.0 +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,
vectorunsigned 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.0 +0100
+++ /var/tmp/diff_new_pack.1Fay8z/_new 2015-02-10 20:23:31.0 +0100
@@ -10,7 +10,7 @@
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2014-05-02 13:58:21
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-02-12
07:03:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2014-05-02 13:58:22.0 +0200
@@ -1,0 +2,20 @@
+Mon Apr 28 12:31:14 UTC 2014 - kkae...@suse.com
+
+- Honor the fact that string properties with EmbeddedInstance
+ qualifier are handled as instance properties.
+ Fixes compatibility issue with cim-schema 2.40.0
+ Add 0001-Honor-that-string-properties-with-EmbeddedInstance-q.patch
+
+---
+Wed Apr 23 13:29:08 UTC 2014 - kkae...@suse.com
+
+- Fix devel dependencies (cmake, sblim-cmpi-devel, cim-schema)
+- Drop cim-server from requires.
+
+---
+Wed Apr 23 13:26:28 UTC 2014 - kkae...@suse.com
+
+- Follow shared library policy
+ rename 'konkretcmpi' to 'libkonkretcmpi0'
+
+---
New:
0001-Honor-that-string-properties-with-EmbeddedInstance-q.patch
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.Ola27f/_old 2014-05-02 13:58:23.0 +0200
+++ /var/tmp/diff_new_pack.Ola27f/_new 2014-05-02 13:58:23.0 +0200
@@ -17,6 +17,8 @@
Name: konkretcmpi
+%define libname lib%{name}
+%define libsoname %{libname}0
Version:0.9.2
Release:0
BuildRequires: cmake
@@ -32,12 +34,6 @@
Group: Development/Libraries/C and C++
# This is necessary to build the RPM as a non-root user.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# yes is the default, but we put it here explicitly to avoid someone
-# setting it to no
-Requires: cim-schema = 2.17
-Requires: cim-server
-Requires: cmake
-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 and below needs -classic switch, kkae...@suse.de
@@ -46,6 +42,10 @@
# 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-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
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -54,19 +54,32 @@
definitions and by providing default implementations for many of the
provider operations.
+%package -n %{libsoname}
+Summary:Shared library of konkretcmpi
+Group: System/Libraries
+Provides: %{name} = %{version}
+Obsoletes: %{name} = %{version}
+
+%description -n %{libsoname}
+This package contains the shared libkonkrekcmpi library.
+
%package devel
-Requires: %{name} = %{version}
Summary:Development files for konkretcmpi
Group: Development/Libraries/C and C++
+Requires: cim-schema = 2.17
+Requires: cmake
+Requires: sblim-cmpi-devel
%description devel
-Development files for konkretcmpi
-
+An open-source tool for rapidly developing CMPI providers in the C
+programming language. KonkretCMPI makes CMPI provider development
+easier by generating type-safe concrete CIM interfaces from MOF
+definitions and by providing default implementations for many of the
+provider operations.
%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))}
@@ -86,6 +99,7 @@
%if 0%{?suse_version} 0%{?suse_version} 1120
%patch1 -p1
%endif
+%patch2 -p1
%build
rm -rf build
@@ -115,15 +129,15 @@
%clean
%{__rm} -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%post -n %{libsoname} -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n %{libsoname} -p /sbin/ldconfig
-%files
+%files -n %{libsoname}
%defattr(-,root,root)
%{_libdir}/libkonkret.so.*
%{_libdir}/libkonkretmof.so.*
-%doc
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2014-02-12 07:03:04
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-02-02
22:19:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2014-02-12 07:03:05.0 +0100
@@ -1,0 +2,6 @@
+Mon Feb 10 11:09:24 UTC 2014 - pwieczorkiew...@suse.com
+
+- Add '%doc README NEWS COPYING' directive to the spec file
+- Needed in SLE12 due to openlmi-providers dependency (fate#316180)
+
+---
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.K4jtyX/_old 2014-02-12 07:03:06.0 +0100
+++ /var/tmp/diff_new_pack.K4jtyX/_new 2014-02-12 07:03:06.0 +0100
@@ -123,6 +123,7 @@
%defattr(-,root,root)
%{_libdir}/libkonkret.so.*
%{_libdir}/libkonkretmof.so.*
+%doc README NEWS COPYING
%files devel
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit konkretcmpi for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2014-02-02 22:19:35.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan 17 11:13:42 UTC 2014 - kkae...@suse.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.BgwHUA/_new 2014-02-02 22:19:36.0 +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, kkae...@suse.de
+# 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)
-Patch2: swig-classic.patch
+# 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
%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.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2013-10-25 11:10:13
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-08-01
15:37:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2013-10-25 11:10:14.0 +0200
@@ -1,0 +2,13 @@
+Thu Oct 17 12:50:28 UTC 2013 - kkae...@suse.com
+
+- Update to 0.9.2
+ * Modifiable templates for method stubs.
+ * Stub substitutions for method name, method type.
+ * Generated code for method input arguments name and type.
+ * Also generated code for output arguments.
+ * Bugfix possible integer overflow.
+ * Name collision avoidance for status variable in generated
+ * Modifiable template for enumeration stub.
+ * Plenty of bugfixes not announced in silent 0.9.1 release.
+
+---
@@ -5,5 +18,5 @@
- - 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
+ * 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
Old:
konkretcmpi-0.9.1.tar.gz
New:
konkretcmpi-0.9.2.tar.gz
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.o4Abez/_old 2013-10-25 11:10:15.0 +0200
+++ /var/tmp/diff_new_pack.o4Abez/_new 2013-10-25 11:10:15.0 +0200
@@ -17,7 +17,7 @@
Name: konkretcmpi
-Version:0.9.1
+Version:0.9.2
Release:0
BuildRequires: cmake
BuildRequires: gcc
++ konkretcmpi-0.9.1.tar.gz - konkretcmpi-0.9.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/konkretcmpi-0.9.1/CMakeLists.txt
new/konkretcmpi-0.9.2/CMakeLists.txt
--- old/konkretcmpi-0.9.1/CMakeLists.txt2013-07-12 08:32:32.0
+0200
+++ new/konkretcmpi-0.9.2/CMakeLists.txt2013-09-25 14:36:56.0
+0200
@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 2.6)
set(CMAKE_C_FLAGS -std=c99 -Wall -pedantic -g -Wextra -Wno-unused-parameter
-Wformat -Wparentheses -Wl,--no-undefined ${CMAKE_C_FLAGS})
-set(CMAKE_CXX_FLAGS -std=c++98 -Wall -pedantic -Wno-long-long -g -Wextra
-Wno-unused-parameter -Wformat -Wparentheses -Wl,--no-undefined
${CMAKE_CXX_FLAGS})
+set(CMAKE_CXX_FLAGS -std=c++98 -Wall -pedantic -Wno-long-long -g -Wextra
-Wno-unused-parameter -Wformat -Wparentheses -Wl,--no-undefined
-Wno-variadic-macros ${CMAKE_CXX_FLAGS})
# Set path to custom cmake modules
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
${CMAKE_MODULE_PATH})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/konkretcmpi-0.9.1/src/konkret/konkret.h
new/konkretcmpi-0.9.2/src/konkret/konkret.h
--- old/konkretcmpi-0.9.1/src/konkret/konkret.h 2013-07-12 08:32:32.0
+0200
+++ new/konkretcmpi-0.9.2/src/konkret/konkret.h 2013-09-25 14:36:56.0
+0200
@@ -205,8 +205,9 @@
fprintf(stderr, CMPIStatus{%u, %s}\n, st-rc, KChars(st-msg));
}
+__attribute__((format(printf, 3, 4)))
KINLINE CMPIStatus __KReturn2(
-const CMPIBroker* cb,
+const CMPIBroker* cb,
CMPIrc rc,
const char* format,
...)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/konkretcmpi-0.9.1/src/mof/MOF_Buffer.cpp
new/konkretcmpi-0.9.2/src/mof/MOF_Buffer.cpp
--- old/konkretcmpi-0.9.1/src/mof/MOF_Buffer.cpp2013-07-12
08:32:32.0 +0200
+++ new/konkretcmpi-0.9.2/src/mof/MOF_Buffer.cpp2013-09-25
14:36:56.0 +0200
@@ -26,10 +26,11 @@
*/
#include MOF_Buffer.h
+#include MOF_Error.h
-inline MOF_uint32 _next_pow_2(MOF_uint32 x)
+inline size_t _next_pow_2(size_t x)
{
-MOF_uint32 r = 1;
+size_t r = 1;
while (r x)
r = 1;
@@ -37,7 +38,7 @@
return r;
}
-inline MOF_uint32 _round_capacity(MOF_uint32 capacity)
+inline size_t _round_capacity(size_t capacity)
{
return capacity 16 ? 16 : _next_pow_2(capacity);
}
@@ -54,6 +55,12 @@
void MOF_Buffer::append(const char* data, size_t size)
{
+if (_size + size _size) {
+// It would overflow, because both size and _size are unsigned
+// and their sum can't be lower than any of them
+MOF_error_printf(Integer overflow detected);
+return;
+
commit konkretcmpi for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2013-08-01 15:37:24.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.xG0LaG/_new 2013-08-01 15:37:25.0 +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.0 +0200
+++ new/konkretcmpi-0.9.1/src/konkret/defaultgi.c 2013-07-12
08:32:32.0 +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.0 +0200
+++ new/konkretcmpi-0.9.1/src/konkret/konkret.h 2013-07-12 08:32:32.0
+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);
+
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2013-07-11 19:34:09
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-04
10:10:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2013-07-11 19:34:11.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 11 12:16:08 UTC 2013 - kkae...@suse.com
+
+- fix libkonkretmof so symlinks
+ add fix-libkonkretmof-so-symlinks.patch
+
+---
New:
fix-libkonkretmof-so-symlinks.patch
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.nFBTix/_old 2013-07-11 19:34:12.0 +0200
+++ /var/tmp/diff_new_pack.nFBTix/_new 2013-07-11 19:34:12.0 +0200
@@ -40,6 +40,8 @@
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
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -77,6 +79,7 @@
%prep
# Untar the sources.
%setup -n konkretcmpi-%{version}
+%patch1 -p1
%build
rm -rf build
++ fix-libkonkretmof-so-symlinks.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/CMakeLists.txt
./src/mof/CMakeLists.txt
--- ../orig-konkretcmpi-0.9.0_35_g9729565/src/mof/CMakeLists.txt
2013-06-03 10:54:24.0 +0200
+++ ./src/mof/CMakeLists.txt2013-07-11 14:02:13.069929423 +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})
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2013-07-04 10:10:46
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-05-13
15:06:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2013-07-04 10:10:47.0 +0200
@@ -1,0 +2,12 @@
+Wed Jun 26 11:35:39 UTC 2013 - kkae...@suse.com
+
+- update to 'proxy' branch (0.9.0_35_g9729565)
+- drop all patches, merged upstream
+
+---
+Tue May 21 09:22:08 UTC 2013 - kkae...@suse.com
+
+- Fix return type for generated indication functions
+ (konkretcmpi-0.9.0-fix-indication-return-type.patch)
+
+---
Old:
enable-direct-call.patch
konkretcmpi-0.9.0-fix-inputoutput-method-arguments.patch
konkretcmpi-0.9.0.tar.gz
konkretcmpi-gcc47.patch
New:
konkretcmpi-0.9.0_35_g9729565.tar.gz
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.hukouY/_old 2013-07-04 10:10:48.0 +0200
+++ /var/tmp/diff_new_pack.hukouY/_new 2013-07-04 10:10:48.0 +0200
@@ -17,7 +17,7 @@
Name: konkretcmpi
-Version:0.9.0
+Version:0.9.0_35_g9729565
Release:0
BuildRequires: cmake
BuildRequires: gcc
@@ -40,10 +40,6 @@
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
@@ -81,13 +77,11 @@
%prep
# Untar the sources.
%setup -n konkretcmpi-%{version}
-%patch1 -p1
-%patch2 -p1
%build
rm -rf build
mkdir build
-cd build
+pushd build
# --with-schema=%{_datadir}/mof/cim-current
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -101,17 +95,13 @@
-DLIB=%{_lib} \
-DWITH_PYTHON=ON \
..
-
-CLFAGS=-DCIMSCHEMA=/usr/share/mof/cim-current %{__make}
+popd
+make %{?_smp_mflags} -C build
%install
-cd build
-%if 0%{?suse_version}
-%makeinstall
-%else
-make DESTDIR=$RPM_BUILD_ROOT install
-%endif
-cd ..
+make DESTDIR=$RPM_BUILD_ROOT install/fast -C build
+# Don't package .la object
+rm -rf $RPM_BUILD_ROOT/usr/lib*/libkonkret.la
%clean
%{__rm} -rf $RPM_BUILD_ROOT
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit konkretcmpi for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2013-05-13 15:06:44.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.mNn1bJ/_new 2013-05-13 15:06:45.0 +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.0 +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))
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2013-04-05 13:09:57
Comparing /work/SRC/openSUSE:Factory/konkretcmpi (Old)
and /work/SRC/openSUSE:Factory/.konkretcmpi.new (New)
Package is konkretcmpi, Maintainer is npax...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/konkretcmpi/konkretcmpi.changes 2012-04-02
19:52:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2013-04-05 13:09:57.0 +0200
@@ -1,0 +2,17 @@
+Mon Mar 11 16:15:15 UTC 2013 - kkae...@suse.com
+
+- Split off -devel subpackage
+
+---
+Mon Mar 11 13:56:51 UTC 2013 - kkae...@suse.com
+
+- Update to 0.9.0
+ * Use CMake as buildsystem (added FindCMPI.cmake and
+FindKonkretCMPI.cmake modules)
+ * Python bindings for the MOF parser
+ * Fixed using experimental schema
+ * Assertion crash fixed
+ * Add missing headers
+ * Many other minor bugs fixed
+
+---
Old:
konkretcmpi-0.8.7.tar.gz
New:
konkretcmpi-0.9.0.tar.gz
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.fhgzS0/_old 2013-04-05 13:10:00.0 +0200
+++ /var/tmp/diff_new_pack.fhgzS0/_new 2013-04-05 13:10:00.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package konkretcmpi
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,14 +17,15 @@
Name: konkretcmpi
+Version:0.9.0
+Release:0
+BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: sblim-cmpi-devel
-Url:http://konkretcmpi.org/
+Url:https://github.com/rnovacek/konkretcmpi
# Increment the version every time the source code changes.
-Version:0.8.7
-Release:0
-Summary:An open-source library/tool for rapidly developing CMPI
providers in the C programming language
+Summary:A tool for developing CMPI providers in the C programming
language
License:MIT
Group: Development/Libraries/C and C++
# This is necessary to build the RPM as a non-root user.
@@ -33,9 +34,10 @@
# setting it to no
Requires: cim-schema = 2.17
Requires: cim-server
+Requires: cmake
Requires: sblim-cmpi-devel
+#Source0:
https://github.com/rnovacek/konkretcmpi/archive/%{version}/konkretcmpi-%{version}.tar.gz
Source0:konkretcmpi-%{version}.tar.gz
-Patch0: konkretcmpi-gcc47.patch
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -44,43 +46,66 @@
definitions and by providing default implementations for many of the
provider operations.
+%package devel
+Requires: %{name} = %{version}
+Summary:Development files for konkretcmpi
+Group: Development/Libraries/C and C++
-
-Authors:
-
-Michael E. Brasher
+%description devel
+Development files for konkretcmpi
%prep
# Untar the sources.
%setup -n konkretcmpi-%{version}
-%patch0 -p1
%build
-CFLAGS=$RPM_OPT_FLAGS -fstack-protector \
-CXXFLAGS=$RPM_OPT_FLAGS -fstack-protector \
-%configure --with-schema=%{_datadir}/mof/cim-current
+rm -rf build
+mkdir build
+cd build
+# --with-schema=%{_datadir}/mof/cim-current
+cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_C_FLAGS_RELEASE:STRING=$RPM_OPT_FLAGS -fstack-protector \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING=$RPM_OPT_FLAGS -fstack-protector \
+ -DCMAKE_SKIP_RPATH=1 \
+ -DPACKAGE_ARCHITECTURE=`uname -m` \
+ -DEXPLICIT_TARGET=$EXPLICIT_TARGET \
+ -DLIB=%{_lib} \
+ ..
+
%{__make}
%install
+cd build
+%if 0%{?suse_version}
%makeinstall
+%else
+make DESTDIR=$RPM_BUILD_ROOT install
+%endif
+cd ..
%clean
%{__rm} -rf $RPM_BUILD_ROOT
-%pre
-
%post -p /sbin/ldconfig
-%preun
-
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
+%{_libdir}/libkonkret.so.*
+%{_libdir}/libkonkretmof.so.*
+
+%files devel
+%defattr(-,root,root)
%dir %{_includedir}/konkret
%{_includedir}/konkret/*.h
-%{_libdir}/*.a*
+%{_libdir}/libkonkret.so
+%{_libdir}/libkonkretmof.so
%{_bindir}/konkret
%{_bindir}/konkretreg
+%{_datadir}/cmake/Modules/*
%changelog
++ konkretcmpi-0.8.7.tar.gz - konkretcmpi-0.9.0.tar.gz ++
46695 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail:
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2012-04-02 19:50:02
Comparing /work/SRC/openSUSE:Factory/konkretcmpi (Old)
and /work/SRC/openSUSE:Factory/.konkretcmpi.new (New)
Package is konkretcmpi, Maintainer is npax...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/konkretcmpi/konkretcmpi.changes 2011-09-23
02:07:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes
2012-04-02 19:52:54.0 +0200
@@ -1,0 +2,5 @@
+Sat Mar 17 15:17:41 UTC 2012 - dims...@opensuse.org
+
+- Add konkretcmpi-gcc47.patch: Fix build with gcc 4.7.
+
+---
New:
konkretcmpi-gcc47.patch
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.zU0ERM/_old 2012-04-02 19:53:01.0 +0200
+++ /var/tmp/diff_new_pack.zU0ERM/_new 2012-04-02 19:53:01.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package konkretcmpi
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,26 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: konkretcmpi
-BuildRequires: gcc gcc-c++ sblim-cmpi-devel
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: sblim-cmpi-devel
Url:http://konkretcmpi.org/
# Increment the version every time the source code changes.
Version:0.8.7
-Release:1
-Group: Development/Libraries/C and C++
+Release:0
Summary:An open-source library/tool for rapidly developing CMPI
providers in the C programming language
License:MIT
+Group: Development/Libraries/C and C++
# This is necessary to build the RPM as a non-root user.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# yes is the default, but we put it here explicitly to avoid someone
# setting it to no
-AutoReqProv:yes
-Requires: cim-server sblim-cmpi-devel
Requires: cim-schema = 2.17
+Requires: cim-server
+Requires: sblim-cmpi-devel
Source0:konkretcmpi-%{version}.tar.gz
+Patch0: konkretcmpi-gcc47.patch
%description
An open-source tool for rapidly developing CMPI providers in the C
@@ -52,6 +53,7 @@
%prep
# Untar the sources.
%setup -n konkretcmpi-%{version}
+%patch0 -p1
%build
CFLAGS=$RPM_OPT_FLAGS -fstack-protector \
++ konkretcmpi-gcc47.patch ++
Index: konkretcmpi-0.8.7/src/program/main.cpp
===
--- konkretcmpi-0.8.7.orig/src/program/main.cpp
+++ konkretcmpi-0.8.7/src/program/main.cpp
@@ -37,6 +37,7 @@
#include cstdarg
#include map
#include cassert
+#include unistd.h
using namespace std;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit konkretcmpi for openSUSE:Factory
Hello community,
here is the log from the commit of package konkretcmpi for openSUSE:Factory
checked in at 2011-12-06 18:21:58
Comparing /work/SRC/openSUSE:Factory/konkretcmpi (Old)
and /work/SRC/openSUSE:Factory/.konkretcmpi.new (New)
Package is konkretcmpi, Maintainer is npax...@novell.com
Changes:
Other differences:
--
++ konkretcmpi.spec ++
--- /var/tmp/diff_new_pack.e9n2Ri/_old 2011-12-06 18:38:32.0 +0100
+++ /var/tmp/diff_new_pack.e9n2Ri/_new 2011-12-06 18:38:32.0 +0100
@@ -26,7 +26,7 @@
Release:1
Group: Development/Libraries/C and C++
Summary:An open-source library/tool for rapidly developing CMPI
providers in the C programming language
-License:X11/MIT
+License:MIT
# This is necessary to build the RPM as a non-root user.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# yes is the default, but we put it here explicitly to avoid someone
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
