Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2022-11-07 13:51:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conmon" Mon Nov 7 13:51:20 2022 rev:26 rq:1033914 version:2.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/conmon/conmon.changes 2022-08-23 14:26:01.815144713 +0200 +++ /work/SRC/openSUSE:Factory/.conmon.new.1597/conmon.changes 2022-11-07 13:51:22.483694723 +0100 @@ -1,0 +2,6 @@ +Fri Nov 4 14:35:09 UTC 2022 - Fabian Vogt <fv...@suse.com> + +- Add patch to fix build with make >= 4.4: + * 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conmon.spec ++++++ --- /var/tmp/diff_new_pack.ipyMFz/_old 2022-11-07 13:51:22.943697309 +0100 +++ /var/tmp/diff_new_pack.ipyMFz/_new 2022-11-07 13:51:22.943697309 +0100 @@ -24,6 +24,8 @@ Group: System/Management URL: https://github.com/containers/conmon Source0: %{name}-%{version}.tar.xz +# https://github.com/containers/conmon/pull/364 +Patch1: 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch BuildRequires: pkgconfig BuildRequires: golang(API) = 1.18 BuildRequires: pkgconfig(glib-2.0) @@ -36,7 +38,7 @@ runc or crun) for a single container. %prep -%setup -q +%autosetup -p1 %build %make_build ++++++ 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch ++++++ >From a549987698d105fab2b2bdddeed49b586f4d799d Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fv...@suse.de> Date: Fri, 4 Nov 2022 15:29:59 +0100 Subject: [PATCH] Fix tools/Makefile with GNU make 4.4 Before GNU make 4.4, "export" variables were not actually exported to $(shell) commands, so the "export GO111MODULE=off" line had no effect. With make >= 4.4, this variable is now set in the environment of the "go build" command, which breaks it. Just remove the wrong variable assignment to have the same behavour as previously. Signed-off-by: Fabian Vogt <fv...@suse.de> --- tools/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 25783ae..0211016 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,5 +1,3 @@ -export GO111MODULE=off - GO := go BUILDDIR := build -- 2.38.0
