Accepting request 885824 from home:cyphar:docker

- Drop long-since upstreamed patch, originally needed to fix i386 builds on
  SLES:
  - 0001-makefile-remove-emoji.patch

OBS-URL: https://build.opensuse.org/request/show/885824
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=118

0001-makefile-remove-emoji.patch

@@ -1,29 +0,0 @@
-From 285c7ac5d5027d45bbcdc49334243f2a3ba6dd05 Mon Sep 17 00:00:00 2001
-From: Aleksa Sarai <asarai@suse.de>
-Date: Mon, 5 Nov 2018 21:12:41 +1100
-Subject: [PATCH] makefile: remove emoji
-
-These break the build on i386 in some very specific circumstances (where
-/bin/sh breaks when handling unicode), and are completely useless when
-it comes to actually building the project.
-
-Signed-off-by: Aleksa Sarai <asarai@suse.de>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: containerd-1.3.7_8fba4e9a7d01/Makefile
-===================================================================
---- containerd-1.3.7_8fba4e9a7d01.orig/Makefile
-+++ containerd-1.3.7_8fba4e9a7d01/Makefile
-@@ -60,8 +60,8 @@ else
- 	DEBUG_TAGS := static_build
- endif
- 
--WHALE = "🇩"
--ONI = "👹"
-+WHALE = "[w]"
-+ONI = "[o]"
- 
- RELEASE=containerd-$(VERSION:v%=%).${GOOS}-${GOARCH}
- 

containerd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 16 05:25:40 UTC 2021 - Aleksa Sarai <asarai@suse.com>
+
+- Drop long-since upstreamed patch, originally needed to fix i386 builds on
+  SLES:
+  - 0001-makefile-remove-emoji.patch
+
 -------------------------------------------------------------------
 Sat Mar  6 07:17:00 UTC 2021 - Aleksa Sarai <asarai@suse.com>
 

containerd.spec

@@ -35,8 +35,6 @@ Group:          System/Management
 URL:            https://containerd.tools
 Source:         %{name}-%{version}_%{git_short}.tar.xz
 Source1:        %{name}-rpmlintrc
-# OPENSUSE-FIX-UPSTREAM: Backport of https://github.com/containerd/containerd/pull/2764.
-Patch1:         0001-makefile-remove-emoji.patch
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  go-go-md2man
@@ -83,7 +81,6 @@ separately from Docker.
 
 %prep
 %setup -q -n %{name}-%{version}_%{git_short}
-%patch1 -p1
 
 %build
 # NOTE: containerd will switch to go.mod in 1.5.x so this can be removed after