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.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.konkretcmpi.new/konkretcmpi.changes 2015-08-05 06:52:13.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Aug 4 13:28:46 UTC 2015 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.puqBNs/_new 2015-08-05 06:52:14.000000000 +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, [email protected] 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 <[email protected]> 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
