diff --git a/0003-fix-option-type-for-minimum-uid.patch b/0003-fix-option-type-for-minimum-uid.patch deleted file mode 100644 index 27c0073..0000000 --- a/0003-fix-option-type-for-minimum-uid.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a8f368c34e826f76d1244fed5095a1615c986b59 Mon Sep 17 00:00:00 2001 -From: Alexey Shabalin -Date: Mon, 1 Oct 2018 18:46:26 +0300 -Subject: [PATCH 2/3] fix option type for minimum uid - ---- - meson.build | 2 +- - meson_options.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 1f75a5b..57f30a5 100644 ---- a/meson.build -+++ b/meson.build -@@ -161,7 +161,7 @@ config_h.set_quoted('ADMIN_GROUP', admin_group) - config_h.set_quoted('EXTRA_ADMIN_GROUPS', extra_admin_groups) - - config_h.set('ENABLE_USER_HEURISTICS', get_option('user_heuristics')) --config_h.set_quoted('MINIMUM_UID', get_option('minimum_uid')) -+config_h.set('MINIMUM_UID', get_option('minimum_uid')) - - # GDM - gdm_conf_file = get_option('gdmconffile') -diff --git a/meson_options.txt b/meson_options.txt -index 878bdd7..12e2f6b 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,7 +4,7 @@ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description - option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts') - option('user_heuristics', type: 'boolean', value: true, description: 'Enable heuristics for guessing system vs. human users in the range 500-minimum-uid') - option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of') --option('minimum_uid', type: 'string', value: '1000', description: 'Set minimum uid for human users') -+option('minimum_uid', type: 'integer', value: 1000, description: 'Set minimum uid for human users') - - option('systemd', type: 'boolean', value: false, description: 'Use systemd') - option('elogind', type: 'boolean', value: false, description: 'Use elogind') --- -2.19.1 - diff --git a/accountsservice.spec b/accountsservice.spec index aec8314..4594232 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: accountsservice -Version: 0.6.54 -Release: 6%{?dist} +Version: 0.6.55 +Release: 1%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information License: GPLv3+ URL: https://www.freedesktop.org/wiki/Software/AccountsService/ @@ -10,9 +10,6 @@ URL: https://www.freedesktop.org/wiki/Software/AccountsService/ #VCS: git:git://git.freedesktop.org/accountsservice Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1646418 -Patch1: 0003-fix-option-type-for-minimum-uid.patch - BuildRequires: gettext-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: glib2-devel @@ -101,6 +98,10 @@ files needed to build applications that use accountsservice-libs. %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Thu Sep 26 2019 Benjamin Berg - 0.6.55-1 +- Update to 0.6.55 + Resolves: #1755838 + * Wed Jul 24 2019 Fedora Release Engineering - 0.6.54-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2140437..97a6640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (accountsservice-0.6.54.tar.xz) = b6037063f1694a2d3a2b47e7f1cf33f29fce29a8bc641f9858d012e457f2a8ab5724f00105307ed961d21eb39a907b6e58c8ac71ae4e85081330bf1b3781bc87 +SHA512 (accountsservice-0.6.55.tar.xz) = c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d