From 1ba9f5667778730821cbb0216b8a82f884b62183 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Apr 21 2018 20:14:22 +0000 Subject: Update to 0.6.46, Spec cleanup, use %%license --- diff --git a/.gitignore b/.gitignore index b2ccae4..09ddcb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1 @@ -/accountsservice-0.6.1.tar.bz2 -/accountsservice-0.6.2.tar.bz2 -/accountsservice-0.6.3.tar.bz2 -/accountsservice-0.6.11.tar.bz2 -/accountsservice-0.6.12.tar.bz2 -/accountsservice-0.6.13.tar.xz -/accountsservice-0.6.14.tar.xz -/accountsservice-0.6.15.tar.xz -/accountsservice-0.6.17.tar.xz -/accountsservice-0.6.18.tar.xz -/accountsservice-0.6.19.tar.xz -/accountsservice-0.6.20.tar.xz -/accountsservice-0.6.21.tar.xz -/accountsservice-0.6.22.tar.xz -/accountsservice-0.6.25.tar.xz -/accountsservice-0.6.26.tar.xz -/accountsservice-0.6.30.tar.xz -/accountsservice-0.6.31.tar.xz -/accountsservice-0.6.32.tar.xz -/accountsservice-0.6.33.tar.xz -/accountsservice-0.6.34.tar.xz -/accountsservice-0.6.35.tar.xz -/accountsservice-0.6.37.tar.xz -/accountsservice-0.6.38.tar.xz -/accountsservice-0.6.39.tar.xz -/accountsservice-0.6.40.tar.xz -/accountsservice-0.6.42.tar.xz +/accountsservice-*.tar.xz diff --git a/0001-lib-add-crypt.h-include.patch b/0001-lib-add-crypt.h-include.patch deleted file mode 100644 index d69fdc2..0000000 --- a/0001-lib-add-crypt.h-include.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c111873f35f29576d655652a95810bfceb1862ef Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 24 Jan 2018 11:17:59 -0500 -Subject: [PATCH] lib: add crypt.h include - -libcrypt is getting cleaved from glibc, and it's definition is -getting moved to crypt.h (along side the crypt_r definition that's -existed for some time) - -This commit add #include to keep things working in old -and new libcs. - -https://bugs.freedesktop.org/show_bug.cgi?id=104771 ---- - src/libaccountsservice/act-user.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c -index 70691a0..da46bc5 100644 ---- a/src/libaccountsservice/act-user.c -+++ b/src/libaccountsservice/act-user.c -@@ -1,58 +1,60 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2004-2005 James M. Cape . - * Copyright (C) 2007-2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - #include - - #include - #include - #include - #include - #include - -+#include -+ - #include - #include - #include - - #include "act-user-private.h" - #include "accounts-user-generated.h" - - /** - * SECTION:act-user - * @title: ActUser - * @short_description: information about a user account - * - * An ActUser object represents a user account on the system. - */ - - /** - * ActUser: - * - * Represents a user account on the system. - */ - - /** - * ActUserAccountType: - * @ACT_USER_ACCOUNT_TYPE_STANDARD: Normal non-administrative user - * @ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR: Administrative user - * - * Type of user account - */ - - /** --- -2.14.3 - diff --git a/accountsservice.spec b/accountsservice.spec index 2e408f1..97467ba 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,18 +1,15 @@ %global _hardened_build 1 Name: accountsservice -Version: 0.6.42 -Release: 9%{?dist} +Version: 0.6.46 +Release: 1%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information - -Group: System Environment/Daemons License: GPLv3+ -URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog +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 -Patch0: 0001-lib-add-crypt.h-include.patch - BuildRequires: glib2-devel BuildRequires: polkit-devel BuildRequires: intltool @@ -24,12 +21,15 @@ BuildRequires: git Requires: polkit Requires: shadow-utils - %{?systemd_requires} +%description +The accountsservice project provides a set of D-Bus interfaces for +querying and manipulating user account information and an implementation +of these interfaces, based on the useradd, usermod and userdel commands. + %package libs Summary: Client-side library to talk to accountsservice -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description libs @@ -37,10 +37,8 @@ The accountsservice-libs package contains a library that can be used by applications that want to interact with the accountsservice daemon. - %package devel Summary: Development files for accountsservice-libs -Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel @@ -48,12 +46,6 @@ The accountsservice-devel package contains headers and other files needed to build applications that use accountsservice-libs. -%description -The accountsservice project provides a set of D-Bus interfaces for -querying and manipulating user account information and an implementation -of these interfaces, based on the useradd, usermod and userdel commands. - - %prep %autosetup -S git @@ -80,7 +72,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %systemd_postun accounts-daemon.service %files -f accounts-service.lang -%doc COPYING README AUTHORS +%license COPYING +%doc README AUTHORS %{_sysconfdir}/dbus-1/system.d/org.freedesktop.Accounts.conf %{_libexecdir}/accounts-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Accounts.xml @@ -105,6 +98,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Sat Apr 21 2018 Peter Robinson 0.4.46-1 +- Update to 0.6.46 +- Spec cleanup, use %%license + * Wed Feb 07 2018 Fedora Release Engineering - 0.6.42-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 43cace0..79950d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77a38325c82effa976cc1a03fbcd5117 accountsservice-0.6.42.tar.xz +SHA512 (accountsservice-0.6.46.tar.xz) = fe603a9d98bb2b22b511f77e2ab78e8134d7b2d78c5e47706eb191697f7f252a8b3e33a99776a1e28491192b818d627a4ba4b972c3c0fc8c8762f78cdcb58054