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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes 2016-03-26 17:29:09.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 13:22:32 UTC 2016 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.9UHunm/_new 2016-03-26 17:29:10.000000000 +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, [email protected] -# 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, [email protected] +Patch4: 0004-Fix-missing-rpath.patch +# PATCH-FIX-UPSTREAM +Patch5: 0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch + +# PATCH-FIX-OPENSUSE, [email protected] +# Adapt for older cmake versions +Patch6: older-cmake.patch + +# PATCH-FIX-OPENSUSE, SWIG/Python on SLE 11 and below needs -classic switch, [email protected] # 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, [email protected] -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 <[email protected]> Date: Tue, 20 May 2014 09:05:03 +0200 Subject: [PATCH 2/5] Don't optimize out module registration --- src/konkret/konkret.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/konkret/konkret.h b/src/konkret/konkret.h index 40d66b36c607..dac188a6b167 100644 --- a/src/konkret/konkret.h +++ b/src/konkret/konkret.h @@ -112,8 +112,10 @@ #ifdef __GNUC__ # define KUNUSED __attribute__((__unused__)) +# define KUSED __attribute__((__used__)) #else # define KUNUSED /* empty */ +# define KUSED /* empty */ #endif /* @@ -2645,7 +2647,7 @@ KEXTERN size_t KStrlcat(char* dest, const char* src, size_t size); */ #define KONKRET_REGISTRATION(NAMESPACE, CLASS, PROVIDERNAME, TYPES) \ - static volatile KUNUSED const char __konkret_registration[] = \ + static volatile KUSED const char __konkret_registration[] = \ "@(#)KONKRET_REGISTRATION=" NAMESPACE ":" CLASS ":" PROVIDERNAME ":" TYPES; #endif /* _konkret_h */ -- 2.7.2 ++++++ 0003-Fix-returning-instance-as-an-output-argument-from-me.patch ++++++ >From aca6c7f910ffe9930b5789969f0adfadd668bb46 Mon Sep 17 00:00:00 2001 From: Michal Minar <[email protected]> Date: Fri, 20 Jun 2014 10:50:45 +0200 Subject: [PATCH 3/5] Fix returning instance as an output argument from method Submitted By: Radek Novacek <[email protected]> --- src/program/main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/program/main.cpp b/src/program/main.cpp index 885dc12f3857..9e7108acdf23 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 -- 2.7.2 ++++++ 0004-Fix-missing-rpath.patch ++++++ >From d101695e468bb07cf07ff2c15ef39fa9361fd810 Mon Sep 17 00:00:00 2001 From: Acer Yang <[email protected]> Date: Thu, 26 Jun 2014 06:43:28 +0800 Subject: [PATCH 4/5] Fix missing rpath. --- cmake/modules/rpath.cmake | 18 ++++++++++++++++++ src/konkret/CMakeLists.txt | 2 +- src/program/CMakeLists.txt | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 cmake/modules/rpath.cmake diff --git a/cmake/modules/rpath.cmake b/cmake/modules/rpath.cmake new file mode 100644 index 000000000000..ffee84fb6974 --- /dev/null +++ b/cmake/modules/rpath.cmake @@ -0,0 +1,18 @@ +# use, i.e. don't skip the full RPATH for the build tree +SET(CMAKE_SKIP_BUILD_RPATH FALSE) + +# when building, don't use the install RPATH already +# (but later on when installing) +SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") + +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + +# the RPATH to be used when installing, but only if it's not a system directory +LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) +IF("${isSystemDir}" STREQUAL "-1") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") +ENDIF("${isSystemDir}" STREQUAL "-1") diff --git a/src/konkret/CMakeLists.txt b/src/konkret/CMakeLists.txt index 25daa9753ab3..c2faa4020528 100644 --- a/src/konkret/CMakeLists.txt +++ b/src/konkret/CMakeLists.txt @@ -8,7 +8,7 @@ set(konkret_SRCS kstr.c print.c ) - +include(rpath) include_directories(${CMPI_INCLUDE_DIR}) add_library(libkonkret SHARED ${konkret_SRCS}) diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt index eb155d0428b5..afcefe596f1d 100644 --- a/src/program/CMakeLists.txt +++ b/src/program/CMakeLists.txt @@ -1,4 +1,4 @@ - +include (rpath) include_directories(${CMPI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src) add_executable(konkret main.cpp) -- 2.7.2 ++++++ 0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch -> 0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch ++++++ --- /work/SRC/openSUSE:Factory/konkretcmpi/0001-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch 2015-08-05 06:52:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/0005-konkretreg-ignore-KONKRET_REGISTRATION-macro-in-libr.patch 2016-03-26 17:29:09.000000000 +0100 @@ -1,7 +1,7 @@ From 4934aad4dca4ef0ec493b7871028f94a7bbfc0f0 Mon Sep 17 00:00:00 2001 From: Radek Novacek <[email protected]> Date: Tue, 4 Aug 2015 12:31:51 +0200 -Subject: [PATCH] konkretreg: ignore KONKRET_REGISTRATION macro in library +Subject: [PATCH 5/5] 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 @@ -34,5 +34,5 @@ size_t r = strlen(p) + 1; -- -2.1.4 +2.7.2
