From cec5d188158eb7b5356b0c596dbb5a64c581696e Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@redhat.com>
Date: Tue, 5 Feb 2019 11:23:04 -0500
Subject: [PATCH] Add patch: Revert removing of open_ended after top level
 plain scalar (rhbz#1672670)

---
 ...of-open_ended-after-top-level-plain-.patch | 32 +++++++++++++++++++
 libyaml.spec                                  | 10 ++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 0001-Revert-removing-of-open_ended-after-top-level-plain-.patch

diff --git a/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch b/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch
new file mode 100644
index 0000000..75de86d
--- /dev/null
+++ b/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch
@@ -0,0 +1,32 @@
+From 8ee83c0da22fe9aa7dea667be8f899a7e32ffb83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tina=20M=C3=BCller?= <cpan2@tinita.de>
+Date: Fri, 29 Jun 2018 21:44:19 +0200
+Subject: [PATCH] Revert removing of open_ended after top level plain scalar
+
+See also issue #60
+
+Revert "This code is not needed and breaks tests"
+
+This reverts commit 56400d976a1999156b1abfd674c3122843980260.
+---
+ src/emitter.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/emitter.c b/src/emitter.c
+index d31e075..32fe07c 100644
+--- a/src/emitter.c
++++ b/src/emitter.c
+@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
+ 
+     emitter->whitespace = 0;
+     emitter->indention = 0;
++    if (emitter->root_context)
++    {
++        emitter->open_ended = 1;
++    }
+ 
+     return 1;
+ }
+-- 
+2.20.1
+
diff --git a/libyaml.spec b/libyaml.spec
index 23e300b..25c7f0d 100644
--- a/libyaml.spec
+++ b/libyaml.spec
@@ -4,7 +4,7 @@
 
 Name:       libyaml
 Version:    0.2.1
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    YAML 1.1 parser and emitter written in C
 
 License:    MIT
@@ -13,8 +13,10 @@ Source0:    http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz
 
 BuildRequires:  gcc
 
-# https://github.com/yaml/libyaml/issues/60
+# https://bugzilla.redhat.com/show_bug.cgi?id=1672670
+# https://github.com/yaml/libyaml/pull/122/
 Patch0:     0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch
+Patch1:     0001-Revert-removing-of-open_ended-after-top-level-plain-.patch
 
 %description
 YAML is a data serialization format designed for human readability and
@@ -35,6 +37,7 @@ developing applications that use LibYAML.
 %prep
 %setup -q -n %{tarballname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -73,6 +76,9 @@ make check
 
 
 %changelog
+* Tue Feb  5 2019 John Eckersberg <eck@redhat.com> - 0.2.1-5
+- Add patch: Revert removing of open_ended after top level plain scalar (rhbz#1672670)
+
 * Tue Feb  5 2019 John Eckersberg <eck@redhat.com> - 0.2.1-4
 - Add patch: Don't emit document-end marker at the end of stream (rhbz#1672670)