Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2021-05-12 19:31:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpkg" Wed May 12 19:31:25 2021 rev:32 rq:891979 version:1.19.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2020-10-06 17:06:17.409277484 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new.2988/dpkg.changes 2021-05-12 19:31:35.319192352 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 09:07:05 UTC 2021 - Martin Li??ka <[email protected]> + +- Add use-clamp-from-C-STD-library.patch in order to fix + clamp clash (boo#1181867). + +------------------------------------------------------------------- New: ---- use-clamp-from-C-STD-library.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.HnYy2v/_old 2021-05-12 19:31:35.859189954 +0200 +++ /var/tmp/diff_new_pack.HnYy2v/_new 2021-05-12 19:31:35.859189954 +0200 @@ -30,6 +30,8 @@ # PATCH-FIX-SUSE: tar of Leap 42.{2,3} does not recognize --sort=name, --clamp-mtime options Patch2: drop-tar-option.patch Patch3: ncurses-fix.patch +# PATCH-FIX-OPENSUSE: Use clamp from C++ STD library. +Patch4: use-clamp-from-C-STD-library.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -89,6 +91,7 @@ %patch2 -p1 %endif %patch3 -p1 +%patch4 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects ++++++ use-clamp-from-C-STD-library.patch ++++++ >From 43bf69b419bcfc0c601015d753b921b6849bae06 Mon Sep 17 00:00:00 2001 From: Martin Liska <[email protected]> Date: Fri, 23 Apr 2021 11:03:59 +0200 Subject: [PATCH] Use clamp from C++ STD library. --- lib/dpkg/macros.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dpkg/macros.h b/lib/dpkg/macros.h index 0c1937a..34387d9 100644 --- a/lib/dpkg/macros.h +++ b/lib/dpkg/macros.h @@ -112,7 +112,6 @@ #ifndef max #define max(a, b) ((a) > (b) ? (a) : (b)) #endif -#endif /** * @def clamp @@ -127,6 +126,8 @@ #define clamp(v, l, h) ((v) > (h) ? (h) : ((v) < (l) ? (l) : (v))) #endif +#endif + /** @} */ #endif /* LIBDPKG_MACROS_H */ -- 2.31.1
