diff --git a/lightdm.spec b/lightdm.spec index 9efa737..8e505eb 100644 --- a/lightdm.spec +++ b/lightdm.spec @@ -2,24 +2,24 @@ %bcond_with tests %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo "2.44") -%global giturl https://github.com/CanonicalLtd/%{name} +%global giturl https://github.com/CanonicalLtd/lightdm Name: lightdm Summary: A cross-desktop Display Manager Version: 1.28.0 -Release: 1%{?dist} +Release: 2%{?dist} # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+ License: (LGPLv2 or LGPLv3) and GPLv3+ URL: https://www.freedesktop.org/wiki/Software/LightDM/ -Source0: %{giturl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{giturl}/archive/%{version}.tar.gz#/lightdm-%{version}.tar.gz -Source10: %{name}.pam -Source11: %{name}-autologin.pam -Source12: %{name}-tmpfiles.conf -Source13: %{name}.service -Source14: %{name}.logrotate -Source15: %{name}.rules +Source10: lightdm.pam +Source11: lightdm-autologin.pam +Source12: lightdm-tmpfiles.conf +Source13: lightdm.service +Source14: lightdm.logrotate +Source15: lightdm.rules # .conf snippets Source20: 50-backup-logs.conf @@ -30,7 +30,7 @@ Source24: 50-xserver-command.conf Source25: 50-disable-guest.conf # Upstreamed: -Patch0: %{giturl}/pull/5.patch#/%{name}-1.25.1-disable_dmrc.patch +Patch0: %{giturl}/pull/5.patch#/ligthdm-1.25.1-disable_dmrc.patch # Upstream commits Patch1: %{giturl}/commit/3daf46c.patch#/fix_double_free.patch @@ -67,7 +67,7 @@ Requires: polkit-js-engine Requires: systemd Requires: xorg-x11-xinit -Requires: %{name}-greeter = 1.2 +Requires: lightdm-greeter = 1.2 %{?systemd_requires} @@ -75,7 +75,7 @@ Requires(pre): shadow-utils Requires(post): psmisc # needed for anaconda to boot into runlevel 5 after install -Provides: service(graphical-login) = %{name} +Provides: service(graphical-login) = lightdm %description Lightdm is a display manager that: @@ -86,10 +86,8 @@ Lightdm is a display manager that: %package gobject Summary: LightDM GObject client library - Requires: %{name}%{?_isa} = %{version}-%{release} Requires: glib2%{?_isa} >= %{glib2_version} - %description gobject This package contains a GObject based library for LightDM clients to use to interface with LightDM. @@ -101,32 +99,23 @@ Requires: %{name}-gobject%{?_isa} = %{version}-%{release} %description gobject-devel %{summary}. - %package qt Summary: LightDM Qt4 client library - Requires: %{name}%{?_isa} = %{version}-%{release} %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} - %description qt This package contains a Qt4-based library for LightDM clients to use to interface with LightDM. - %package qt-devel Summary: Development files for %{name}-qt Requires: %{name}-qt%{?_isa} = %{version}-%{release} - %description qt-devel %{summary}. - %package qt5 Summary: LightDM Qt5 client library - Requires: %{name}%{?_isa} = %{version}-%{release} -%{?_qt5:Requires: %{?_qt5}%{?_isa} >= %{_qt5_version}} - %description qt5 This package contains a Qt5-based library for LightDM clients to use to interface with LightDM. @@ -135,7 +124,6 @@ with LightDM. %package qt5-devel Summary: Development files for %{name}-qt5 Requires: %{name}-qt5%{?_isa} = %{version}-%{release} - %description qt5-devel %{summary}. @@ -143,22 +131,21 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %prep %autosetup -p 1 + +%build # Make libtoolize happy. %{__cat} %{_datadir}/aclocal/intltool.m4 > aclocal.m4 - # Bootstrap NOCONFIGURE=1 ./autogen.sh - -%build %configure \ --disable-dmrc \ --disable-silent-rules \ --disable-static \ --enable-gtk-doc \ --enable-libaudit \ - --enable-lib%{name}-qt \ - --enable-lib%{name}-qt5 \ + --enable-liblightdm-qt \ + --enable-liblightdm-qt5 \ --enable-introspection \ %if %{with tests} --enable-tests \ @@ -166,8 +153,9 @@ NOCONFIGURE=1 ./autogen.sh --disable-tests \ %endif --enable-vala \ - --with-greeter-user=%{name} \ - --with-greeter-session=%{name}-greeter + --with-greeter-user=lightdm \ + --with-greeter-session=lightdm-greeter + %make_build @@ -175,21 +163,20 @@ NOCONFIGURE=1 ./autogen.sh %make_install # We need to own these -%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.d/ \ +%{__mkdir_p} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/ \ %{buildroot}%{_datadir}/dbus-1/interfaces \ %{buildroot}%{_datadir}/dbus-1/system.d \ - %{buildroot}%{_datadir}/%{name}/%{name}.conf.d/ \ - %{buildroot}%{_datadir}/%{name}/remote-sessions/ \ + %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/ \ + %{buildroot}%{_datadir}/lightdm/remote-sessions/ \ %{buildroot}%{_datadir}/xgreeters/ \ - %{buildroot}%{_localstatedir}/cache/%{name}/ \ - %{buildroot}%{_localstatedir}/run/%{name}/ \ - %{buildroot}%{_localstatedir}/log/%{name}/ \ - %{buildroot}%{_localstatedir}/lib/%{name}/ \ - %{buildroot}%{_localstatedir}/lib/%{name}-data/ + %{buildroot}%{_localstatedir}/cache/lightdm/ \ + %{buildroot}%{_localstatedir}/run/lightdm/ \ + %{buildroot}%{_localstatedir}/log/lightdm/ \ + %{buildroot}%{_localstatedir}/lib/lightdm/ \ + %{buildroot}%{_localstatedir}/lib/lightdm-data/ # libtool cruft -%{_bindir}/find %{buildroot}%{_libdir} -type f -name '*.a' -print -delete -%{_bindir}/find %{buildroot}%{_libdir} -type f -name '*.la' -print -delete +rm -fv %{buildroot}%{_libdir}/lib*.la # We don't ship AppAmor %{__rm} -rfv %{buildroot}%{_sysconfdir}/apparmor.d/ @@ -198,20 +185,22 @@ NOCONFIGURE=1 ./autogen.sh %{__rm} -rfv %{buildroot}%{_sysconfdir}/init # install pam file -%{__install} -Dpm 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/%{name} -%{__install} -Dpm 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/%{name}-autologin -%{__install} -Dpm 0644 %{SOURCE12} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf -%{__install} -Dpm 0644 %{SOURCE13} %{buildroot}%{_unitdir}/%{name}.service -%{__install} -Dpm 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%{__install} -Dpm 0644 %{SOURCE15} %{buildroot}%{_datadir}/polkit-1/rules.d/%{name}.rules +%{__install} -Dpm 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/lightdm +%{__install} -Dpm 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin +%{__install} -Dpm 0644 %{SOURCE12} %{buildroot}%{_prefix}/lib/tmpfiles.d/lightdm.conf +%{__install} -Dpm 0644 %{SOURCE13} %{buildroot}%{_unitdir}/lightdm.service +%{__install} -Dpm 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/logrotate.d/lightdm +%{__install} -Dpm 0644 %{SOURCE15} %{buildroot}%{_datadir}/polkit-1/rules.d/lightdm.rules %{__install} -pm 0644 %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} \ - %{SOURCE24} %{SOURCE25} %{buildroot}%{_datadir}/%{name}/%{name}.conf.d/ + %{SOURCE24} %{SOURCE25} %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/ # Move DBus config to proper location. +# why is this needed? -- rex %{__mv} -f %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf \ %{buildroot}%{_datadir}/dbus-1/system.d -%find_lang %{name} --with-gnome +%find_lang lightdm --with-gnome + %if %{with tests} %check @@ -220,106 +209,101 @@ NOCONFIGURE=1 ./autogen.sh %pre -%{_bindir}/getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name} -%{_bindir}/getent passwd %{name} >/dev/null || %{_sbindir}/useradd -g %{name} \ - -M -d /var/lib/%{name} -s /sbin/nologin -r %{name} +%{_bindir}/getent group lightdm >/dev/null || %{_sbindir}/groupadd -r lightdm +%{_bindir}/getent passwd lightdm >/dev/null || %{_sbindir}/useradd -g lightdm \ + -M -d /var/lib/lightdm -s /sbin/nologin -r lightdm exit 0 - %post +# todo: document need/purpose for this snippet if [ $1 = 1 ] ; then %{_bindir}/killall -HUP dbus-daemon 2>&1 > /dev/null fi -%{?systemd_post:%systemd_post %{name}.service} - +%{?systemd_post:%systemd_post lightdm.service} %preun -%{?systemd_preun:%systemd_preun %{name}.service} - +%{?systemd_preun:%systemd_preun lightdm.service} %postun %{?systemd_postun} - -%ldconfig_scriptlets gobject -%ldconfig_scriptlets qt -%ldconfig_scriptlets qt5 - - -%files -f %{name}.lang +%files -f lightdm.lang %license COPYING.GPL3 %doc NEWS -%config(noreplace) %{_sysconfdir}/pam.d/%{name}* -%config(noreplace) %{_sysconfdir}/%{name}/keys.conf -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/%{name}/users.conf -%dir %{_sysconfdir}/%{name}/ -%dir %{_sysconfdir}/%{name}/%{name}.conf.d +%dir %{_sysconfdir}/lightdm/ +%dir %{_sysconfdir}/lightdm/lightdm.conf.d +%config(noreplace) %{_sysconfdir}/pam.d/lightdm* +%config(noreplace) %{_sysconfdir}/lightdm/keys.conf +%config(noreplace) %{_sysconfdir}/lightdm/lightdm.conf +%config(noreplace) %{_sysconfdir}/lightdm/users.conf %dir %{_sysconfdir}/logrotate.d/ -%dir %attr(-,%{name},%{name}) %{_localstatedir}/cache/%{name}/ -%dir %attr(-,%{name},%{name}) %{_localstatedir}/lib/%{name}/ -%dir %attr(-,%{name},%{name}) %{_localstatedir}/lib/%{name}-data/ -%dir %attr(-,%{name},%{name}) %{_localstatedir}/log/%{name}/ +%{_sysconfdir}/logrotate.d/lightdm +%dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/ +%dir %attr(-,lightdm,lightdm) %{_localstatedir}/lib/lightdm/ +%dir %attr(-,lightdm,lightdm) %{_localstatedir}/lib/lightdm-data/ +%dir %attr(-,lightdm,lightdm) %{_localstatedir}/log/lightdm/ %dir %{_datadir}/bash-completion/ %dir %{_datadir}/bash-completion/completions/ %dir %{_datadir}/xgreeters/ -%ghost %dir %{_localstatedir}/run/%{name} -%{_sysconfdir}/logrotate.d/%{name} +%ghost %dir %{_localstatedir}/run/lightdm %{_bindir}/dm-tool -%{_sbindir}/%{name} -%{_libexecdir}/%{name}-guest-session -%{_datadir}/%{name}/ +%{_sbindir}/lightdm +%{_libexecdir}/lightdm-guest-session +%{_datadir}/lightdm/ %{_libdir}/girepository-1.0/LightDM-1.typelib %{_mandir}/man1/dm-tool.1* -%{_mandir}/man1/%{name}* -%{_unitdir}/%{name}.service +%{_mandir}/man1/lightdm* +%{_unitdir}/lightdm.service %{_datadir}/accountsservice %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/dbus-1/system.d/*.conf -%{_datadir}/polkit-1/rules.d/%{name}.rules +%{_datadir}/polkit-1/rules.d/lightdm.rules %{_datadir}/polkit-1/actions/org.freedesktop.DisplayManager.AccountsService.policy %{_datadir}/bash-completion/completions/dm-tool -%{_datadir}/bash-completion/completions/%{name} -%{_prefix}/lib/tmpfiles.d/%{name}.conf +%{_datadir}/bash-completion/completions/lightdm +%{_prefix}/lib/tmpfiles.d/lightdm.conf +%ldconfig_scriptlets gobject %files gobject %license COPYING.LGPL2 COPYING.LGPL3 -%{_libdir}/lib%{name}-gobject-1.so.0* - +%{_libdir}/liblightdm-gobject-1.so.0* %files gobject-devel -%doc %{_datadir}/gtk-doc/html/%{name}-gobject-1/ -%{_includedir}/%{name}-gobject-1/ -%{_libdir}/lib%{name}-gobject-1.so -%{_libdir}/pkgconfig/lib%{name}-gobject-1.pc +%doc %{_datadir}/gtk-doc/html/lightdm-gobject-1/ +%{_includedir}/lightdm-gobject-1/ +%{_libdir}/liblightdm-gobject-1.so +%{_libdir}/pkgconfig/liblightdm-gobject-1.pc %{_datadir}/gir-1.0/LightDM-1.gir -%{_datadir}/vala/vapi/lib%{name}-gobject-1.* +%{_datadir}/vala/vapi/liblightdm-gobject-1.* +%ldconfig_scriptlets qt %files qt %license COPYING.LGPL2 COPYING.LGPL3 -%{_libdir}/lib%{name}-qt-3.so.0* - +%{_libdir}/liblightdm-qt-3.so.0* %files qt-devel -%{_includedir}/%{name}-qt-3/ -%{_libdir}/lib%{name}-qt-3.so -%{_libdir}/pkgconfig/lib%{name}-qt-3.pc +%{_includedir}/lightdm-qt-3/ +%{_libdir}/liblightdm-qt-3.so +%{_libdir}/pkgconfig/liblightdm-qt-3.pc +%ldconfig_scriptlets qt5 %files qt5 %license COPYING.LGPL2 COPYING.LGPL3 -%{_libdir}/lib%{name}-qt5-3.so.0* - +%{_libdir}/liblightdm-qt5-3.so.0* %files qt5-devel -%{_includedir}/%{name}-qt5-3/ -%{_libdir}/lib%{name}-qt5-3.so -%{_libdir}/pkgconfig/lib%{name}-qt5-3.pc +%{_includedir}/lightdm-qt5-3/ +%{_libdir}/liblightdm-qt5-3.so +%{_libdir}/pkgconfig/liblightdm-qt5-3.pc %changelog +* Wed Sep 26 2018 Rex Dieter - 1.28.0-2 +- revert over-aggressive use of %%name macro + * Sat Sep 01 2018 Leigh Scott - 1.28.0-1 - lightdm-1.28.0