From 539f88b362f5b9acfe0f345e47a7f598e2993e00e659f1a6258923d8a7413b02 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 22 May 2021 12:34:48 +0000 Subject: [PATCH] Accepting request 894959 from X11:Deepin:Factory - Keep golang version on 1.15 on Tumbleweed, the project does not support golang 1.16+ OBS-URL: https://build.opensuse.org/request/show/894959 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=13 --- deepin-daemon.changes | 6 ++++++ deepin-daemon.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deepin-daemon.changes b/deepin-daemon.changes index 0f79023..c909f56 100644 --- a/deepin-daemon.changes +++ b/deepin-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 22 11:53:04 UTC 2021 - Hillwood Yang + +- Keep golang version on 1.15 on Tumbleweed, the project does not support + golang 1.16+ + ------------------------------------------------------------------- Sat May 1 13:46:23 UTC 2021 - Hillwood Yang diff --git a/deepin-daemon.spec b/deepin-daemon.spec index b730560..0b03d72 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -40,7 +40,9 @@ Patch1: %{name}-libinput.patch Patch2: disable-gobuild-in-makefile.patch Patch3: xvfb-run.patch Group: System/GUI/Other -# BuildRequires: golang(API) = 1.11 +%if 0%{?suse_version} > 1500 +BuildRequires: golang(API) = 1.15 +%endif BuildRequires: golang-packaging BuildRequires: deepin-gettext-tools BuildRequires: fontpackages-devel