From 84ea8249c84a35fef7e85e052b4cfc9c1c9dd0a3 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 24 Oct 2023 14:56:35 +0300
Subject: [PATCH] Fix mismerge for tensorflow (from report)

---
 800.renames-and-merges/t.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/800.renames-and-merges/t.yaml b/800.renames-and-merges/t.yaml
index a71018976..a57db6a5e 100644
--- a/800.renames-and-merges/t.yaml
+++ b/800.renames-and-merges/t.yaml
@@ -68,7 +68,9 @@
 - { setname: telepresence,             name: telepresence2 }
 - { setname: template-glib,            name: libtemplate-glib }
 - { setname: tensorboard,              name: ["python:tensorboard", "python:tensorboard1", "python:tensorflow-tensorboard"] }
-- { setname: tensorflow,               namepat: "(?:lib|python:)?tensorflow[0-9.-]*(gnu-hpc|gnu-openmpi2-hpc|lite|cpu|gpu)?", addflavor: $1 }
+- { setname: tensorflow,               namepat: "(?:lib)?tensorflow[0-9.-]*(gnu-hpc|gnu-openmpi2-hpc|lite|cpu|gpu)?", addflavor: $1 }
+- { setname: tensorflow,               name: python:tensorflow }
+- { setname: tensorflow,               name: [python:tensorflow-cpu, python:tensorflow-gpu], addflavor: true }
 - { setname: tepl,                     namepat: "(?:lib)?tepl[0-9.-]*" }
 - { setname: terminal-markdown-viewer, name: mdv }
 - { setname: termtosvg,                name: "python:termtosvg" }