From 9bafb5922f699c15c83fafa8c607fd743651686d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 26 Mar 2019 11:07:20 -0400 Subject: [PATCH] New upstream release (rhbz#1692750) --- .gitignore | 1 + ...ment-end-marker-at-the-end-of-stream.patch | 35 ------------------- ...of-open_ended-after-top-level-plain-.patch | 32 ----------------- libyaml.spec | 29 +++++++-------- sources | 2 +- 5 files changed, 15 insertions(+), 84 deletions(-) delete mode 100644 0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch delete mode 100644 0001-Revert-removing-of-open_ended-after-top-level-plain-.patch diff --git a/.gitignore b/.gitignore index 9f43fea..188725d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ yaml-0.1.3.tar.gz /yaml-0.1.6.tar.gz /yaml-0.1.7.tar.gz /yaml-0.2.1.tar.gz +/libyaml-0.2.2.tar.gz diff --git a/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch b/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch deleted file mode 100644 index 90ec44a..0000000 --- a/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 56f4b17221868593d6903ee58d6d679b690cf4df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tina=20M=C3=BCller?= -Date: Fri, 29 Jun 2018 23:16:26 +0200 -Subject: [PATCH] Don't emit document-end marker at the end of stream - -(only when explicitly requested) - -@jrtc27++ for the patch. - -See #60 ---- - src/emitter.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/emitter.c b/src/emitter.c -index 32fe07c..2744495 100644 ---- a/src/emitter.c -+++ b/src/emitter.c -@@ -649,13 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, - - else if (event->type == YAML_STREAM_END_EVENT) - { -- if (emitter->open_ended) -- { -- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) -- return 0; -- if (!yaml_emitter_write_indent(emitter)) -- return 0; -- } - - if (!yaml_emitter_flush(emitter)) - return 0; --- -2.20.1 - 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 deleted file mode 100644 index 75de86d..0000000 --- a/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ee83c0da22fe9aa7dea667be8f899a7e32ffb83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tina=20M=C3=BCller?= -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 25c7f0d..a5caf15 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,22 +1,17 @@ -%define tarballname yaml - -#====================================================================# - Name: libyaml -Version: 0.2.1 -Release: 5%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT URL: http://pyyaml.org/ -Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz +Source0: http://pyyaml.org/download/libyaml/%{name}-%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: doxygen BuildRequires: gcc - -# 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 +BuildRequires: libtool %description YAML is a data serialization format designed for human readability and @@ -35,14 +30,13 @@ developing applications that use LibYAML. %prep -%setup -q -n %{tarballname}-%{version} -%patch0 -p1 -%patch1 -p1 +%setup -q -n %{name}-%{version} %build +./bootstrap %configure -make %{?_smp_mflags} +make all html %{?_smp_mflags} %install @@ -76,6 +70,9 @@ make check %changelog +* Tue Mar 26 2019 John Eckersberg - 0.2.2-1 +- New upstream release (rhbz#1692750) + * Tue Feb 5 2019 John Eckersberg - 0.2.1-5 - Add patch: Revert removing of open_ended after top level plain scalar (rhbz#1672670) diff --git a/sources b/sources index a97e113..b61bfb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-0.2.1.tar.gz) = 97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 +SHA512 (libyaml-0.2.2.tar.gz) = 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06