From d8e5a0879f1ef7124279dd2cb6db7892ec47724a Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 27 Sep 2018 14:06:19 -0400 Subject: [PATCH 1/6] oops, port to meson --- accountsservice.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/accountsservice.spec b/accountsservice.spec index 82f553d..9c42252 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -12,12 +12,12 @@ Source0: http://www.freedesktop.org/software/accountsservice/accountsserv BuildRequires: glib2-devel BuildRequires: polkit-devel -BuildRequires: intltool BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: git +BuildRequires: meson Requires: polkit Requires: shadow-utils @@ -50,14 +50,12 @@ files needed to build applications that use accountsservice-libs. %autosetup -S git %build -%configure --enable-user-heuristics -make %{?_smp_mflags} - +%meson -Duser_heuristics=true -Dgtk_doc=true +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/*.la -rm $RPM_BUILD_ROOT%{_libdir}/*.a +%meson_install + %find_lang accounts-service %ldconfig_scriptlets libs @@ -73,7 +71,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %files -f accounts-service.lang %license COPYING -%doc README AUTHORS +%doc README.md AUTHORS %{_sysconfdir}/dbus-1/system.d/org.freedesktop.Accounts.conf %{_libexecdir}/accounts-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Accounts.xml From c55c84c24d649a6a22952937ee35e2aa0165600c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 28 Sep 2018 10:04:22 -0400 Subject: [PATCH 2/6] add dbus buildrequires (needed for finding interface dir) --- accountsservice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/accountsservice.spec b/accountsservice.spec index 9c42252..a07e8db 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -10,6 +10,7 @@ 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 +BuildRequires: pkgconfig(dbus-1) BuildRequires: glib2-devel BuildRequires: polkit-devel BuildRequires: systemd From 7f3decfdb64960eb22f8fe966a9ef14ef8eb84d8 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 28 Sep 2018 10:11:47 -0400 Subject: [PATCH 3/6] add gettext buildrequires --- accountsservice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/accountsservice.spec b/accountsservice.spec index a07e8db..26f144a 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -10,6 +10,7 @@ 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 +BuildRequires: gettext-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: glib2-devel BuildRequires: polkit-devel From d725545527334a66c28299c1798de148bc75b076 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sat, 29 Sep 2018 08:58:14 -0400 Subject: [PATCH 4/6] Update to 0.6.54 --- accountsservice.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/accountsservice.spec b/accountsservice.spec index 26f144a..eada0c5 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: accountsservice -Version: 0.6.53 +Version: 0.6.54 Release: 1%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information License: GPLv3+ @@ -98,6 +98,9 @@ files needed to build applications that use accountsservice-libs. %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Sat Sep 29 2018 Ray Strode - 0.6.54-1 +- Update to 0.6.54 + * Thu Sep 27 2018 Ray Strode - 0.6.53-1 - Update to 0.6.53 diff --git a/sources b/sources index 25279d7..2140437 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (accountsservice-0.6.53.tar.xz) = ccbec1b5a14e08146af1e528624a570af5014aa2e7b3e87d39b1718c0d281444863f7950d61b54027a9207e3c21b50b8b867b972187f57150c50ed99ca7e2514 +SHA512 (accountsservice-0.6.54.tar.xz) = b6037063f1694a2d3a2b47e7f1cf33f29fce29a8bc641f9858d012e457f2a8ab5724f00105307ed961d21eb39a907b6e58c8ac71ae4e85081330bf1b3781bc87 From 076d6d98014912383f53333f1b18baf824b1a000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 14 Jan 2019 18:54:55 +0100 Subject: [PATCH 5/6] Rebuilt for libcrypt.so.2 (#1666033) --- accountsservice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accountsservice.spec b/accountsservice.spec index eada0c5..ecb3192 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -2,7 +2,7 @@ Name: accountsservice Version: 0.6.54 -Release: 1%{?dist} +Release: 2%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information License: GPLv3+ URL: https://www.freedesktop.org/wiki/Software/AccountsService/ @@ -98,6 +98,9 @@ files needed to build applications that use accountsservice-libs. %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Mon Jan 14 2019 Björn Esser - 0.6.54-2 +- Rebuilt for libcrypt.so.2 (#1666033) + * Sat Sep 29 2018 Ray Strode - 0.6.54-1 - Update to 0.6.54 From 885a0f95c3ba1392f44b997962664676288245c6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 17 Jan 2019 15:42:23 -0800 Subject: [PATCH 6/6] Explicitly enable systemd support (#1576903) This is from Elliott Sales de Andrade via Bugzilla, thanks - manually rediffed against a later change to the spec. --- accountsservice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/accountsservice.spec b/accountsservice.spec index ecb3192..07bd676 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -2,7 +2,7 @@ Name: accountsservice Version: 0.6.54 -Release: 2%{?dist} +Release: 3%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information License: GPLv3+ URL: https://www.freedesktop.org/wiki/Software/AccountsService/ @@ -52,7 +52,7 @@ files needed to build applications that use accountsservice-libs. %autosetup -S git %build -%meson -Duser_heuristics=true -Dgtk_doc=true +%meson -Dgtk_doc=true -Dsystemd=true -Duser_heuristics=true %meson_build %install @@ -98,6 +98,9 @@ files needed to build applications that use accountsservice-libs. %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Thu Jan 17 2019 Adam Williamson - 0.6.54-3 +- Explicitly enable systemd support (#1576903) (Elliott Sales de Andrade) + * Mon Jan 14 2019 Björn Esser - 0.6.54-2 - Rebuilt for libcrypt.so.2 (#1666033)