From 859947cb442cb6824eb60d4185f00b2e6c2a2bd0 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sep 02 2021 13:46:10 +0000 Subject: + umockdev-0.16.2-1 Update to 0.16.2 --- diff --git a/.gitignore b/.gitignore index 31e0e36..ae1fc22 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /0.15.4.tar.gz /umockdev-0.16.0.tar.xz /umockdev-0.16.1.tar.xz +/umockdev-0.16.2.tar.xz diff --git a/0001-docs-Work-around-creation-of-umockdev.types.patch b/0001-docs-Work-around-creation-of-umockdev.types.patch new file mode 100644 index 0000000..88558f4 --- /dev/null +++ b/0001-docs-Work-around-creation-of-umockdev.types.patch @@ -0,0 +1,56 @@ +From e79dc63b931b4d1603bae09a81d9953733721208 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 26 Aug 2021 13:52:38 +0200 +Subject: [PATCH] docs: Work-around creation of umockdev.types + +meson doesn't seem to have a way to tell gtk-doc where the .c files to +extract the type functions from would be when they're generated, like +they are for Vala sources. + +Work around this by providing a static .types file. + +See https://github.com/mesonbuild/meson/issues/3892 +--- + docs/reference/meson.build | 9 ++------- + docs/reference/umockdev.types | 4 ++++ + 2 files changed, 6 insertions(+), 7 deletions(-) + create mode 100644 docs/reference/umockdev.types + +diff --git a/docs/reference/meson.build b/docs/reference/meson.build +index 737f861..8c5e5da 100644 +--- a/docs/reference/meson.build ++++ b/docs/reference/meson.build +@@ -3,18 +3,13 @@ version_xml = configure_file( + output: 'version.xml', + configuration: conf) + +-# HACK: need to find valac'ed umockdev.c for gtk-doc; https://github.com/mesonbuild/meson/issues/3892 +-# this isn't predictable between meson versions +-umockdev_c = run_command('sh', '-ec', 'find -name umockdev.c| xargs dirname').stdout().strip() +-umockdev_ioctl_c = run_command('sh', '-ec', 'find -name umockdev-ioctl.c| xargs dirname').stdout().strip() +- + gnome = import('gnome') + gnome.gtkdoc('umockdev', + main_xml: 'umockdev-docs.xml', +- src_dir: [meson.build_root(), umockdev_c, umockdev_ioctl_c], ++ src_dir: [meson.build_root()], + content_files: [version_xml], ++ gobject_typesfile: 'umockdev.types', + ignore_headers: ['uevent_sender.h', 'ioctl_tree.h', 'debug.h'], +- scan_args: ['--rebuild-types'], + dependencies: [glib, gobject, declare_dependency(link_with : [umockdev_lib])], + install: true, + ) +diff --git a/docs/reference/umockdev.types b/docs/reference/umockdev.types +new file mode 100644 +index 0000000..e35006e +--- /dev/null ++++ b/docs/reference/umockdev.types +@@ -0,0 +1,4 @@ ++umockdev_ioctl_base_get_type ++umockdev_ioctl_client_get_type ++umockdev_ioctl_data_get_type ++umockdev_testbed_get_type +-- +2.31.1 + diff --git a/sources b/sources index cdef943..5e7baac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (umockdev-0.16.1.tar.xz) = baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8 +SHA512 (umockdev-0.16.2.tar.xz) = 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea diff --git a/umockdev.spec b/umockdev.spec index c589976..f6b1f78 100644 --- a/umockdev.spec +++ b/umockdev.spec @@ -1,5 +1,5 @@ Name: umockdev -Version: 0.16.1 +Version: 0.16.2 Release: 1%{?dist} Summary: Mock hardware devices @@ -17,6 +17,9 @@ BuildRequires: libpcap-devel BuildRequires: vala BuildRequires: chrpath +# https://github.com/martinpitt/umockdev/pull/141 +Patch0: 0001-docs-Work-around-creation-of-umockdev.types.patch + %description With this program and libraries you can easily create mock udev objects. This is useful for writing tests for software which talks to @@ -69,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/umockdev %{_datadir}/vala/vapi/umockdev-1.0.vapi %changelog +* Thu Sep 02 2021 Bastien Nocera - 0.16.2-1 ++ umockdev-0.16.2-1 +- Update to 0.16.2 + * Fri Jul 02 2021 Bastien Nocera - 0.16.1-1 + umockdev-0.16.1-1 - Update to 0.16.1