From 040a560372f18773f85fec48ba6716d2a06f34e93d48ba1fafcb413f4a21521b Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 1 Aug 2019 13:57:32 +0000 Subject: [PATCH] Accepting request 720071 from home:tinita:branches:devel:libraries:c_c++ I am a co-maintainer for https://github.com/yaml/libyaml The patch isn't needed anymore with version 0.2.2, so I removed it. OBS-URL: https://build.opensuse.org/request/show/720071 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyaml?expand=0&rev=25 --- libyaml-revert-emitter-changes.patch | 32 ---------------------------- libyaml.changes | 5 +++++ libyaml.spec | 3 --- 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 libyaml-revert-emitter-changes.patch diff --git a/libyaml-revert-emitter-changes.patch b/libyaml-revert-emitter-changes.patch deleted file mode 100644 index 7dc08c4..0000000 --- a/libyaml-revert-emitter-changes.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 1/2] 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; - } - - diff --git a/libyaml.changes b/libyaml.changes index 9b999b9..aaf0e9e 100644 --- a/libyaml.changes +++ b/libyaml.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 31 16:12:22 CEST 2019 - Tina Müller + +- Remove patch + * Patch libyaml-revert-emitter-changes.patch is not needed anymore +------------------------------------------------------------------- Thu Apr 18 13:17:19 UTC 2019 - Ondřej Súkup - update to 0.2.2 diff --git a/libyaml.spec b/libyaml.spec index 590988a..f86411e 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -24,8 +24,6 @@ License: MIT Group: Development/Libraries/C and C++ URL: http://pyyaml.org/wiki/LibYAML Source: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz -# PATCH-FIX-UPSTREAM libyaml-revert-emitter-changes.patch -- gh#yaml/libyaml#122 -Patch: libyaml-revert-emitter-changes.patch BuildRequires: pkgconfig %description @@ -51,7 +49,6 @@ a YAML 1.1 parser and emitter written in C. %prep %setup -q -n yaml-%{version} -%patch -p1 %build %configure --disable-static