Upgrade to version 22.08.8

accountsservice.spec

@@ -1,16 +1,14 @@
 Name:           accountsservice
-Version:        0.6.55
+Version:        22.08.8
-Release:        2
+Release:        1
 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
+BuildRequires:  meson gobject-introspection-devel gettext-devel glib2-devel vala
 Requires:       polkit shadow-utils
 %systemd_requires
 
@@ -39,10 +37,10 @@ are contained in %{name}-devel package.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version}
 
 %build
-%meson -Dgtk_doc=true -Duser_heuristics=true
+%meson -Dgtk_doc=true
 %meson_build
 
 %install
@@ -70,9 +68,11 @@ are contained in %{name}-devel package.
 %{_datadir}/locale/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/system-services/*.service
-%{_libexecdir}/accounts-daemon
+%{_datadir}/dbus-1/system.d/*.conf
 %{_unitdir}/accounts-daemon.service
-%{_sysconfdir}/dbus-1/system.d/*.conf
+%{_datadir}/accountsservice/user-templates/*
+%{_datadir}/vala/vapi/*
+%{_libexecdir}/accounts-daemon
 
 %files libs
 %{_libdir}/*.so.*
@@ -89,6 +89,9 @@ are contained in %{name}-devel package.
 %{_datadir}/gtk-doc/html/libaccountsservice/*
 
 %changelog
+* Tue Jun 21 2022 yangzhao <yangzhao1@kylinos.cn> - 22.08.8-1
+- Upgrade to version 22.08.8
+
 * Mon Jun 20 2022 wangkeorng <wangkerong@h-partners.com> - 0.6.55-2
 - fix build fail on meson-0.6
 

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

@@ -1,29 +0,0 @@
-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
-