diff --git a/.gitignore b/.gitignore index 17a55ca..95180b0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /modulemd-1.1.3.tar.xz /modulemd-1.2.0.tar.xz /modulemd-1.3.0.tar.xz +/modulemd-1.4.0.tar.xz diff --git a/0001-Defaults-emitter-should-use-the-correct-name-key.patch b/0001-Defaults-emitter-should-use-the-correct-name-key.patch deleted file mode 100644 index a05cb05..0000000 --- a/0001-Defaults-emitter-should-use-the-correct-name-key.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2f302ac7dfa5d922cf1981752153f53a69eaa2c9 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Mon, 16 Apr 2018 08:29:15 -0400 -Subject: [PATCH] Defaults emitter should use the correct name key - -The specification requires that module name is represented as -"module: ", but the emitter was writing out -"name: " instead. - -Signed-off-by: Stephen Gallagher ---- - modulemd/modulemd-yaml-emitter-defaults.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modulemd/modulemd-yaml-emitter-defaults.c b/modulemd/modulemd-yaml-emitter-defaults.c -index cfd580a5dce40dc817d13e7e6bc09f6a7a786588..f6dc9e52a87ac8eed336ed475fd4dabebd19dfa7 100644 ---- a/modulemd/modulemd-yaml-emitter-defaults.c -+++ b/modulemd/modulemd-yaml-emitter-defaults.c -@@ -190,11 +190,11 @@ _emit_defaults_data (yaml_emitter_t *emitter, - YAML_EMITTER_EMIT_WITH_ERROR_RETURN ( - emitter, &event, error, "Error starting data mapping"); - - - /* Module name */ -- name = g_strdup ("name"); -+ name = g_strdup ("module"); - value = modulemd_defaults_dup_module_name (defaults); - MMD_YAML_EMIT_STR_STR_DICT (&event, name, value, YAML_PLAIN_SCALAR_STYLE); - - - /* Module default stream */ --- -2.17.0 - diff --git a/libmodulemd.spec b/libmodulemd.spec index f1d2ea4..44d3dec 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -1,12 +1,12 @@ %global majorversion 1 -%global minorversion 3 +%global minorversion 4 %global patchversion 0 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 Name: libmodulemd Version: %{majorminorversion}%{?patchversion:.%{patchversion}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Module metadata manipulation library License: MIT @@ -23,9 +23,6 @@ BuildRequires: python3-gobject-base # Patches -# Defaults emitter wasn't following the spec properly. Included upstream -# https://github.com/fedora-modularity/libmodulemd/commit/2f302ac7dfa5d922cf1981752153f53a69eaa2c9 -Patch0001: 0001-Defaults-emitter-should-use-the-correct-name-key.patch %description C Library for manipulating module metadata files. @@ -74,6 +71,14 @@ export LC_CTYPE=C.utf8 %{_datadir}/gtk-doc/html/modulemd/ %changelog +* Wed Apr 25 2018 Stephen Gallagher - 1.4.0-1 +- Update to version 1.4.0 +- Adds new API for returning failed YAML subdocuments +- Stop emitting log messages by default (polluting consumer logs) +- Validate RPM artifacts for proper NEVRA format +- Improve the validator tool +- Drop upstreamed patch + * Mon Apr 16 2018 Stephen Gallagher - 1.3.0-2 - Fix serious error in modulemd-defaults emitter diff --git a/sources b/sources index 3a76246..f08219d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modulemd-1.3.0.tar.xz) = e55a014ba4cde890d63755b1032f62d4667f1467de18ee618fe10fc742ac3e28b17ac9938fe941ce18c819d7a1d904ae2fa9fada55c3f2ad3d5622816ec8b3a0 +SHA512 (modulemd-1.4.0.tar.xz) = 2fe8c9642a4f67c0b11929c8fbf81ade228de43ac8bbdeab4bd16c9e0faed2d64cb6d930b7ff064ea2d2eaffaba335f222c03c3d7d129557ac07ba78536aac4a