Unverified Commit a442528e authored by Björn Esser's avatar Björn Esser
Browse files

Move DBus config to proper location

parent 7cc567d2
......@@ -7,7 +7,7 @@
Name: lightdm
Summary: A cross-desktop Display Manager
Version: 1.25.1
Release: 2%{?dist}
Release: 3%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -176,6 +176,8 @@ NOCONFIGURE=1 ./autogen.sh
# We need to own these
%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.d/ \
%{buildroot}%{_datadir}/dbus-1/interfaces \
%{buildroot}%{_datadir}/dbus-1/interfaces \
%{buildroot}%{_datadir}/%{name}/%{name}.conf.d/ \
%{buildroot}%{_datadir}/%{name}/remote-sessions/ \
%{buildroot}%{_datadir}/xgreeters/ \
......@@ -205,6 +207,12 @@ 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
%{__mv} -f %{_sysconfdir}/dbus-1/system.d/*.conf \
%{buildroot}%{_datadir}/dbus-1/system.d
%find_lang %{name} --with-gnome
%if %{with tests}
......@@ -256,7 +264,6 @@ fi
%files -f %{name}.lang
%license COPYING.GPL3
%doc NEWS
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%config(noreplace) %{_sysconfdir}/pam.d/%{name}*
%config(noreplace) %{_sysconfdir}/%{name}/keys.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
......@@ -281,7 +288,8 @@ fi
%{_mandir}/man1/dm-tool.1*
%{_mandir}/man1/%{name}*
%{_unitdir}/%{name}.service
%{_datadir}/accountsservice/interfaces/org.freedesktop.DisplayManager.AccountsService.xml
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/dbus-1/system.d/*.conf
%{_datadir}/polkit-1/rules.d/%{name}.rules
%{_datadir}/polkit-1/actions/org.freedesktop.DisplayManager.AccountsService.policy
%{_datadir}/bash-completion/completions/dm-tool
......@@ -326,6 +334,9 @@ fi
%changelog
* Fri Jan 19 2018 Björn Esser <besser82@fedoraproject.org> - 1.25.1-3
- Move DBus config to proper location
* Fri Jan 19 2018 Björn Esser <besser82@fedoraproject.org> - 1.25.1-2
- Fix claiming DBus service name (rhbz#1428379)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment