From 10b81cb0da62db5c0ed897a0c10aaf8638a69f31 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 19 2018 15:06:48 +0000 Subject: Move DBus interfaces to proper location and create symlinks --- diff --git a/lightdm.spec b/lightdm.spec index bd96782..0d1803b 100644 --- a/lightdm.spec +++ b/lightdm.spec @@ -7,7 +7,7 @@ Name: lightdm Summary: A cross-desktop Display Manager Version: 1.25.1 -Release: 3%{?dist} +Release: 4%{?dist} # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+ License: (LGPLv2 or LGPLv3) and GPLv3+ @@ -207,9 +207,16 @@ NOCONFIGURE=1 ./autogen.sh %{__install} -pm 0644 %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} \ %{SOURCE24} %{SOURCE25} %{buildroot}%{_datadir}/%{name}/%{name}.conf.d/ -# Move DBus config to proper location -%{__mv} -f %{buildroot}%{_datadir}/accountsservice/interfaces/*.xml \ - %{buildroot}%{_datadir}/dbus-1/interfaces +# Move DBus interfaces to proper location and create symlinks. +# See: https://cgit.freedesktop.org/accountsservice/tree/doc/org.mydm.MyDisplayManager.Wallpaper.xml +for f in %{buildroot}%{_datadir}/accountsservice/interfaces/*.xml; do + %{__mv} -f $f %{buildroot}%{_datadir}/dbus-1/interfaces + f="`%{_bindir}/basename $f`" + %{__ln_s} ../../dbus-1/interfaces/$f \ + %{buildroot}%{_datadir}/accountsservice/interfaces/$f +done + +# Move DBus config to proper location. %{__mv} -f %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf \ %{buildroot}%{_datadir}/dbus-1/system.d @@ -288,6 +295,7 @@ fi %{_mandir}/man1/dm-tool.1* %{_mandir}/man1/%{name}* %{_unitdir}/%{name}.service +%{_datadir}/accountsservice/interfaces/*.xml %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/dbus-1/system.d/*.conf %{_datadir}/polkit-1/rules.d/%{name}.rules @@ -334,6 +342,9 @@ fi %changelog +* Fri Jan 19 2018 Björn Esser - 1.25.1-4 +- Move DBus interfaces to proper location and create symlinks + * Fri Jan 19 2018 Björn Esser - 1.25.1-3 - Move DBus config to proper location