Accepting request 1033542 from home:favogt:branches:devel:microos

- Add patch to fix build with make >= 4.4:
  * 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch

OBS-URL: https://build.opensuse.org/request/show/1033542
OBS-URL: https://build.opensuse.org/package/show/devel:microos/conmon?expand=0&rev=7

0001-Fix-tools-Makefile-with-GNU-make-4.4.patch

@@ -0,0 +1,29 @@
+From a549987698d105fab2b2bdddeed49b586f4d799d Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@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 <fvogt@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
+

conmon.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  4 14:35:09 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Add patch to fix build with make >= 4.4:
+  * 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
+
 -------------------------------------------------------------------
 Wed Aug 17 20:16:56 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

conmon.spec

@@ -24,6 +24,8 @@ License:        Apache-2.0
 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 @@ container manager (like podman or CRI-O) and an OCI runtime (like
 runc or crun) for a single container.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %make_build