[packages/libmodulemd] - updated to 2.15.1
qboosh
qboosh at pld-linux.org
Thu May 15 18:54:57 CEST 2025
commit 30035c9cf0a025ca728ea16bcba8bf1d2cc2b696
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu May 15 18:33:56 2025 +0200
- updated to 2.15.1
libmodulemd.spec | 8 ++++----
no-docs-for-build.patch | 50 ++++++++++++++++++++++++++++---------------------
2 files changed, 33 insertions(+), 25 deletions(-)
---
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 08aa985..2dc1ee8 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -8,13 +8,13 @@
Summary: Module metadata manipulation library
Summary(pl.UTF-8): Biblioteka operowania na metadanych modułów
Name: libmodulemd
-Version: 2.15.0
-Release: 3
+Version: 2.15.1
+Release: 1
License: MIT
Group: Libraries
#Source0Download: https://github.com/fedora-modularity/libmodulemd/releases
Source0: https://github.com/fedora-modularity/libmodulemd/releases/download/%{version}/modulemd-%{version}.tar.xz
-# Source0-md5: 3d231596fad04b1a16ff67257b3145da
+# Source0-md5: 4105ba80835e051e6e129dd4d53abb9a
Patch0: no-docs-for-build.patch
URL: https://github.com/fedora-modularity/libmodulemd
BuildRequires: glib2-devel >= 2.0
@@ -130,7 +130,7 @@ Prosty walidator YAML-a modulemd.
%build
%meson \
-Dwith_docs=%{__true_false apidocs} \
- -Dglib_docpath=%{_gtkdocdir} \
+ -Dglib_docpath=%{_gidocdir} \
%{?with_python2:-Dwith_py2=true} \
%{!?with_python3:-Dwith_py2=false}
diff --git a/no-docs-for-build.patch b/no-docs-for-build.patch
index 8dec6d5..4b2c6d8 100644
--- a/no-docs-for-build.patch
+++ b/no-docs-for-build.patch
@@ -1,28 +1,36 @@
---- modulemd-2.15.0/meson.build.orig 2023-05-20 11:03:06.755527932 +0200
-+++ modulemd-2.15.0/meson.build 2023-05-20 11:05:27.564765103 +0200
-@@ -69,21 +69,7 @@ test = find_program('test')
- with_docs = get_option('with_docs')
+--- modulemd-2.15.1/meson.build.orig 2025-05-09 12:43:40.000000000 +0200
++++ modulemd-2.15.1/meson.build 2025-05-15 18:14:03.692096923 +0200
+@@ -70,17 +70,15 @@ with_docs = get_option('with_docs')
+ gtk_doc_referred_paths = []
if with_docs
gtkdoc = dependency('gtk-doc')
-- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
--
-- glib_index_path = join_paths(glib_docpath, 'glib/index.html')
-- ret = run_command ([test, '-e', glib_index_path],
-- check: false)
-- if ret.returncode() != 0
-- error('Missing documentation for GLib: @0@'.format(glib_index_path))
-- endif
--
-- gobject_index_path = join_paths(glib_docpath, 'gobject/index.html')
-- ret = run_command ([test, '-e', gobject_index_path],
-- check: false)
-- if ret.returncode() != 0
-- error('Missing documentation for GObject: @0@'.format(gobject_index_path))
-- endif
+ glib_docpath = get_option('glib_docpath')
- endif
- # Keep with_manpages option a tristate feature for backward compatibility.
+ if glib.version().version_compare('<2.79.0')
+- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+ glib_modules = ['glib', 'gobject' ]
+ else
+ warning('glib >= 2.79.0 documention might not be properly referred from libmodulemd documentation.')
+ if glib.version().version_compare('<2.80.1')
+- glib_docpath = join_paths(glib_prefix, 'share', 'doc', 'glib-2.0')
+ glib_modules = ['glib', 'gobject' ]
+ else
+- glib_docpath = join_paths(glib_prefix, 'share', 'doc')
+ glib_modules = ['glib-2.0', 'gobject-2.0' ]
+ endif
+ endif
+@@ -88,11 +86,6 @@ if with_docs
+ foreach referred_module : glib_modules
+ doc_module_path = join_paths(glib_docpath, referred_module)
+ doc_index_file = join_paths(doc_module_path, 'index.html')
+- ret = run_command ([test, '-e', doc_index_file],
+- check: false)
+- if ret.returncode() != 0
+- error('Missing GTK documentation for @0@: @1@'.format(referred_module, doc_index_file))
+- endif
+ gtk_doc_referred_paths += [ doc_module_path ]
+ endforeach
+ endif
--- modulemd-2.12.0/meson_options.txt~ 2021-01-15 03:08:36.000000000 +0100
+++ modulemd-2.12.0/meson_options.txt 2021-03-13 21:09:46.821667993 +0100
@@ -32,6 +32,8 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmodulemd.git/commitdiff/30035c9cf0a025ca728ea16bcba8bf1d2cc2b696
More information about the pld-cvs-commit
mailing list