!8 修复在meson-0.60版本上构建失败

From: @kerongw 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

accountsservice.spec

@@ -1,12 +1,14 @@
 Name:           accountsservice
 Version:        0.6.55
-Release:        1
+Release:        2
 Summary:        D-Bus service for accessing the list of user accounts and information attached to those accounts.
 
 License:        GPLv3+
 URL:            https://www.freedesktop.org/wiki/Software/AccountsService/
 Source0:        https://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
 
+Patch6000:	backport-fix-build-with-meson-0.6-version.patch
+
 BuildRequires:  gtk-doc polkit-devel libxslt pkgconfig(dbus-1) systemd systemd-devel
 BuildRequires:  meson gobject-introspection-devel gettext-devel glib2-devel
 Requires:       polkit shadow-utils
@@ -37,7 +39,7 @@ are contained in %{name}-devel package.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
 
 %build
 %meson -Dgtk_doc=true -Duser_heuristics=true
@@ -87,6 +89,9 @@ are contained in %{name}-devel package.
 %{_datadir}/gtk-doc/html/libaccountsservice/*
 
 %changelog
+* Mon Jun 20 2022 wangkeorng <wangkerong@h-partners.com> - 0.6.55-2
+- fix build fail on meson-0.6
+
 * Thu Jan 28 2021 yanglu <yanglu60@huawei.com> - 0.6.55-1
 - Version update
 

backport-fix-build-with-meson-0.6-version.patch

@@ -0,0 +1,29 @@
+From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: [PATCH] Fix build with meson 0.60
+
+Positional parameters to merge_file() were never allowed and always
+ignored, so just drop it.
+See: https://github.com/mesonbuild/meson/issues/9441
+
+Fixes #97
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 4987937..ed0e2c4 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -29,7 +29,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: policy,
+   po_dir: po_dir,
+--
+2.27.0
+