Merge branch 'master' into epel7
This commit is contained in:
commit
b4f17ea01e
4 changed files with 32 additions and 36 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -18,3 +18,4 @@
|
|||
/modulemd-1.5.0.tar.xz
|
||||
/modulemd-1.5.1.tar.xz
|
||||
/modulemd-1.5.2.tar.xz
|
||||
/modulemd-1.6.0.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 0039d41002629342e245d43350702b502aabe3f1 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Gallagher <sgallagh@redhat.com>
|
||||
Date: Fri, 22 Jun 2018 13:26:01 -0400
|
||||
Subject: [PATCH] Allocate Modulemd.props.buildopts at object creation
|
||||
|
||||
Resolves: https://github.com/fedora-modularity/libmodulemd/issues/72
|
||||
|
||||
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
|
||||
---
|
||||
modulemd/modulemd-module.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/modulemd/modulemd-module.c b/modulemd/modulemd-module.c
|
||||
index 9eb391a4ff82f4b1b2f660276cb3f46962f774b7..49c4818a9130c7af31d4abf0cbbb898f06d779a3 100644
|
||||
--- a/modulemd/modulemd-module.c
|
||||
+++ b/modulemd/modulemd-module.c
|
||||
@@ -3460,10 +3460,12 @@ modulemd_module_class_init (ModulemdModuleClass *klass)
|
||||
|
||||
static void
|
||||
modulemd_module_init (ModulemdModule *self)
|
||||
{
|
||||
/* Allocate the members */
|
||||
+ self->buildopts = modulemd_buildopts_new ();
|
||||
+
|
||||
self->buildrequires =
|
||||
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
|
||||
|
||||
self->module_components =
|
||||
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
%global majorversion 1
|
||||
%global minorversion 5
|
||||
%global patchversion 2
|
||||
%global minorversion 6
|
||||
%global patchversion 0
|
||||
%global majorminorversion %{majorversion}.%{minorversion}
|
||||
%global nsversion %{majorversion}.0
|
||||
|
||||
|
|
@ -19,6 +19,7 @@ BuildRequires: pkgconfig(gobject-2.0)
|
|||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(yaml-0.1)
|
||||
BuildRequires: pkgconfig(gtk-doc)
|
||||
BuildRequires: valgrind
|
||||
|
||||
# Patches
|
||||
|
||||
|
|
@ -45,7 +46,15 @@ sed -r -i -e "/g-ir-scanner/s/-l(gobject-2.0|glib-2.0|yaml)//g" %{_vpath_builddi
|
|||
%meson_build
|
||||
|
||||
%check
|
||||
|
||||
export LC_CTYPE=C.utf8
|
||||
|
||||
%ifarch %{power64}
|
||||
# Valgrind is broken on ppc64[le] with GCC7:
|
||||
# https://bugs.kde.org/show_bug.cgi?id=386945
|
||||
export MMD_SKIP_VALGRIND=1
|
||||
%endif
|
||||
|
||||
%meson_test
|
||||
|
||||
%install
|
||||
|
|
@ -69,9 +78,27 @@ export LC_CTYPE=C.utf8
|
|||
%{_datadir}/gir-1.0/Modulemd-%{nsversion}.gir
|
||||
%dir %{_datadir}/gtk-doc
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
%{_datadir}/gtk-doc/html/modulemd/
|
||||
%{_datadir}/gtk-doc/html/modulemd-1.0/
|
||||
|
||||
%changelog
|
||||
* Wed Jul 18 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.6.0-1
|
||||
- Update to 1.6.0
|
||||
- Adds Modulemd.ModuleStream object, deprecating Modulemd.Module
|
||||
- Adds Modulemd.Translation and Modulemd.TranslationEntry objects
|
||||
- Adds Modulemd.ImprovedModule object that collects streams, defaults and
|
||||
translations together
|
||||
- Adds new Modulemd.index_from_*() funtions to get a hash table of
|
||||
Modulemd.ImprovedModule objects for easier searching
|
||||
- Moves function documentation to the public headers
|
||||
- Corrects the license headers to MIT (they were incorrectly listed as MITNFA
|
||||
in previous releases)
|
||||
- Makes the "eol" field optional for Modulemd.ServiceLevel
|
||||
- Clean up HTML documentation
|
||||
- Fixes a type error on 32-bit systems
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Jun 23 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.5.2-1
|
||||
- Update to libdmodulemd 1.5.2
|
||||
- Don't free uninitialized memory
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (modulemd-1.5.2.tar.xz) = ba368712c37cdf7ff72649efa7ef165d4e38522909471d106a4f39e57f20fc437aaa7d0200516cea373eb83779a6abb53377306ea99d0c901f4f647d47ab8f00
|
||||
SHA512 (modulemd-1.6.0.tar.xz) = 76fb0e1c8fd2bc66ec68740ac177705746834eac15291d326339b186b9f7dd5c42f1c870963e65f29b68eb25538a5f015995b5a10db099c2ffa867911fb69481
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue