Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package k3s for openSUSE:Factory checked in
at 2021-06-04 00:33:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/k3s (Old)
and /work/SRC/openSUSE:Factory/.k3s.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3s"
Fri Jun 4 00:33:59 2021 rev:9 rq:897218 version:1.21.1+k3s1
Changes:
--------
--- /work/SRC/openSUSE:Factory/k3s/k3s.changes 2021-06-01 10:35:50.068646819
+0200
+++ /work/SRC/openSUSE:Factory/.k3s.new.1898/k3s.changes 2021-06-04
00:34:19.389002548 +0200
@@ -1,0 +2,6 @@
+Thu Jun 3 13:23:59 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Drop cni-bin-dir.patch in favor a sed command to handle multiple
+ %{_libexec} values - boo#1186566
+
+-------------------------------------------------------------------
Old:
----
cni-bin-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ k3s.spec ++++++
--- /var/tmp/diff_new_pack.ohHuhc/_old 2021-06-04 00:34:20.005004322 +0200
+++ /var/tmp/diff_new_pack.ohHuhc/_new 2021-06-04 00:34:20.009004333 +0200
@@ -34,7 +34,6 @@
Source2: k3s-agent.service
Source3: server.conf
Source4: agent.conf
-Patch0: cni-bin-dir.patch
BuildRequires: c_compiler
BuildRequires: golang-packaging
BuildRequires: pkgconfig
@@ -70,8 +69,7 @@
%prep
%setup -q -n %{name}-%(echo %{version} | tr '+' '-')
-sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{PATCH0}
-%patch0 -p1
+sed -i
's#exec.LookPath("host-local")#exec.LookPath("%{_libexecdir}/cni/host-local")#'
pkg/agent/config/config.go
%build
%{goprep} github.com/rancher/k3s
