Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fprintd for openSUSE:Factory checked in at 2022-02-27 22:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fprintd (Old) and /work/SRC/openSUSE:Factory/.fprintd.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fprintd" Sun Feb 27 22:42:51 2022 rev:16 rq:957798 version:1.94.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fprintd/fprintd.changes 2021-11-27 23:42:29.340460505 +0100 +++ /work/SRC/openSUSE:Factory/.fprintd.new.1958/fprintd.changes 2022-02-27 22:43:03.378629804 +0100 @@ -1,0 +2,14 @@ +Tue Feb 22 17:10:28 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add upstream bug fix patches, fix build with meson 0.60.x and + newer: + + f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch + + 2c34cef5ef2004d8479475db5523c572eb409a6b.patch + +------------------------------------------------------------------- +Wed Feb 9 19:30:24 UTC 2022 - Carsten Ziepke <[email protected]> + +- Fix for openSUSE Leap 15.3, makro %{_pam_moduledir} is unknown in + openSUSE Leap 15.3 + +------------------------------------------------------------------- New: ---- 2c34cef5ef2004d8479475db5523c572eb409a6b.patch f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fprintd.spec ++++++ --- /var/tmp/diff_new_pack.sfEJeJ/_old 2022-02-27 22:43:03.974629976 +0100 +++ /var/tmp/diff_new_pack.sfEJeJ/_new 2022-02-27 22:43:03.978629977 +0100 @@ -1,7 +1,7 @@ # # spec file for package fprintd # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,11 @@ URL: https://fprint.freedesktop.org/ Source0: https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 Source1: baselibs.conf +# PATCH-FIX-UPSTREAM f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch -- Fix build with meson 0.60.x and newer +Patch0: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch +# PATCH-FIX-UPSTREAM 2c34cef5ef2004d8479475db5523c572eb409a6b.patch -- Fix build with meson 0.60.x and newer +Patch1: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch + BuildRequires: cmake BuildRequires: gobject-introspection BuildRequires: gtk-doc >= 1.3 @@ -111,10 +116,14 @@ %lang_package %prep -%setup -q -n %{name}-v%{version} +%autosetup -p1 -n %{name}-v%{version} %build +%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} +%meson -Dgtk_doc=true -Dpam=true -Dpam_modules_dir=/%{_lib}/security +%else %meson -Dgtk_doc=true -Dpam=true -Dpam_modules_dir=%{_pam_moduledir} +%endif %meson_build %install @@ -161,7 +170,11 @@ %files pam %doc pam/README +%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} +/%{_lib}/security/pam_fprintd.so +%else %{_pam_moduledir}/pam_fprintd.so +%endif %{_mandir}/man8/pam_fprintd.8%{?ext_man} %files doc ++++++ 2c34cef5ef2004d8479475db5523c572eb409a6b.patch ++++++ >From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001 From: Eli Schwartz <[email protected]> Date: Tue, 11 Jan 2022 20:46:29 -0500 Subject: [PATCH] remove pointless copying of files into build directory I'm not entirely sure what this did, but it seems to be obsoleted by commit 93bad825406d13ed5eb2cf27541dc58194bef8f3. --- doc/dbus/meson.build | 6 +++--- src/meson.build | 20 ++++++------------- ....xml => net.reactivated.Fprint.Device.xml} | 0 ...xml => net.reactivated.Fprint.Manager.xml} | 0 4 files changed, 9 insertions(+), 17 deletions(-) rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%) rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%) diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build index 861da64..431127d 100644 --- a/doc/dbus/meson.build +++ b/doc/dbus/meson.build @@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', ) dbus_interfaces_refs = [] -foreach interface_file: dbus_interfaces_files - basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() +foreach interface_file: dbus_interfaces + basename = run_command('basename', interface_file, '.xml').stdout().strip() dbus_interfaces_refs += custom_target(basename + '_ref', input: docbook_xml_header, output: basename + '.ref.xml', build_by_default: true, - depends: interface_file, + depend_files: interface_file, capture: true, command: [ bash, '-c', diff --git a/src/meson.build b/src/meson.build index 1df6216..a7ce3fe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,22 +1,14 @@ bash = find_program('bash') -dbus_interfaces = ['Manager', 'Device'] -dbus_interfaces_files = [] +dbus_interfaces = files( + 'net.reactivated.Fprint.Manager.xml', + 'net.reactivated.Fprint.Device.xml', +) -foreach interface_name: dbus_interfaces - interface = interface_name.to_lower() - interface_file = interface + '.xml' - dbus_interfaces_files += custom_target('dbus_interface_' + interface, - input: interface_file, - output: 'net.reactivated.Fprint.@[email protected]'.format(interface_name), - command: ['cp', '@INPUT@', '@OUTPUT@'], - install: true, - install_dir: dbus_interfaces_dir, - ) -endforeach +install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) # NOTE: We should pass "--glib-min-required 2.64" but cannot fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', - sources: dbus_interfaces_files, + sources: dbus_interfaces, autocleanup: 'all', interface_prefix: 'net.reactivated.Fprint.', namespace: 'FprintDBus', diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml similarity index 100% rename from src/device.xml rename to src/net.reactivated.Fprint.Device.xml diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml similarity index 100% rename from src/manager.xml rename to src/net.reactivated.Fprint.Manager.xml -- GitLab ++++++ f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch ++++++ >From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 From: Eli Schwartz <[email protected]> Date: Tue, 11 Jan 2022 21:06:35 -0500 Subject: [PATCH] use more idiomatic/correct embedded shell scripting Formatting arguments into code is fragile, and meson natively knows how to pass files as arguments via argv. So pass them as arguments to the shell. --- doc/dbus/meson.build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build index 802938e..861da64 100644 --- a/doc/dbus/meson.build +++ b/doc/dbus/meson.build @@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files capture: true, command: [ bash, '-c', - 'cat @INPUT@;' + - xsltproc.path() + ' @0@/@1@ '.format( - meson.source_root(), - files('spec-to-docbook.xsl')[0]) + - interface_file.full_path() + '| tail -n +2;', + 'cat "$1"; "$2" "$3" "$4" | tail -n +2', + '_', # argv0 ignored + '@INPUT@', + xsltproc, files('spec-to-docbook.xsl')[0], interface_file ], ) endforeach -- GitLab
