From bbdbf47540b8b81e07bab0df7e2db2d4e1ed617bdde51ba707fdacce9d12349b Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 16 Jan 2020 08:58:28 +0000
Subject: [PATCH] - add dtc-no-common-conflict.patch (bsc#1160388)

OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=50
---
 dtc-no-common-conflict.patch | 10 ++++++++++
 dtc.changes                  |  5 +++++
 dtc.spec                     |  4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 dtc-no-common-conflict.patch

diff --git a/dtc-no-common-conflict.patch b/dtc-no-common-conflict.patch
new file mode 100644
index 0000000..819eaf5
--- /dev/null
+++ b/dtc-no-common-conflict.patch
@@ -0,0 +1,10 @@
+--- dtc-lexer.l
++++ dtc-lexer.l
+@@ -23,7 +23,6 @@
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/dtc.changes b/dtc.changes
index 5603423..4bd7a56 100644
--- a/dtc.changes
+++ b/dtc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 14 12:54:51 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- add dtc-no-common-conflict.patch (bsc#1160388)
+
 -------------------------------------------------------------------
 Sun Dec  8 09:18:44 UTC 2019 - Martin Liška <mliska@suse.cz>
 
diff --git a/dtc.spec b/dtc.spec
index 2af4a9b..16a3eb5 100644
--- a/dtc.spec
+++ b/dtc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dtc
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ URL:            https://github.com/dgibson/dtc
 Source0:        https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-%{version}.tar.gz
 Source1:        https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-%{version}.tar.sign
 Source2:        baselibs.conf
+Patch0:         dtc-no-common-conflict.patch
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libyaml-devel
@@ -71,6 +72,7 @@ Python binding part.
 
 %prep
 %setup -q
+%patch0
 
 %build
 export EXTRA_CFLAGS="%{optflags}"