diff --git a/files/lightdm.conf b/files/lightdm.conf --- a/files/lightdm.conf +++ b/files/lightdm.conf @@ -24,7 +24,7 @@ #lock-memory=true #user-authority-in-system-dir=false #guest-account-script=guest-account -#logind-check-graphical=false +logind-check-graphical=true #log-directory=/var/log/lightdm #run-directory=/var/run/lightdm #cache-directory=/var/cache/lightdm diff --git a/files/lightdm.service b/files/lightdm.service --- a/files/lightdm.service +++ b/files/lightdm.service @@ -1,6 +1,7 @@ [Unit] Description=Display Manager Conflicts=xdm.service gdm.service kdm.service lxdm.service slim.service +After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service [Service] ExecStart=/usr/sbin/lightdm diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : lightdm version : 1.28.0 -release : 32 +release : 33 source : - https://github.com/CanonicalLtd/lightdm/releases/download/1.28.0/lightdm-1.28.0.tar.xz : f20f599d8d7cf90b77a2df33c6e9e615abc443123b1b228de1c20a636aecfa07 homepage : https://github.com/CanonicalLtd/lightdm @@ -44,7 +44,7 @@ %make -j1 install : | %make_install - install -d -m 00755 $installdir/%libdir%/systemd/system/graphical.target.wants + install -dm00755 $installdir/%libdir%/systemd/system/graphical.target.wants ln -s %libdir%/systemd/system/lightdm.service $installdir/%libdir%/systemd/system/displaymanager.service ln -s %libdir%/systemd/system/lightdm.service $installdir/%libdir%/systemd/system/graphical.target.wants/lightdm.service # Stateless configuration @@ -52,15 +52,15 @@ # We don't use apparmor rm -rf $installdir/etc/init rm -rf $installdir/etc/apparmor.d - install -m 00644 $pkgfiles/lightdm.service $installdir/%libdir%/systemd/system/lightdm.service - install -D -m 00755 $pkgfiles/lightdm-wrapper $installdir/usr/bin/lightdm-wrapper - install -D -m 00644 $pkgfiles/lightdm.conf $installdir/usr/share/lightdm/lightdm.conf.d/10_solus_default.conf - install -m 00644 $pkgfiles/users.conf $installdir/usr/share/lightdm/users.conf + install -m00644 $pkgfiles/lightdm.service $installdir/%libdir%/systemd/system/lightdm.service + install -Dm00755 $pkgfiles/lightdm-wrapper $installdir/usr/bin/lightdm-wrapper + install -Dm00644 $pkgfiles/lightdm.conf $installdir/usr/share/lightdm/lightdm.conf.d/10_solus_default.conf + install -m00644 $pkgfiles/users.conf $installdir/usr/share/lightdm/users.conf - install -D -m 00644 $pkgfiles/lightdm.tmpfiles $installdir/%libdir%/tmpfiles.d/lightdm.conf - install -D -m 00644 $pkgfiles/lightdm.sysusers $installdir/%libdir%/sysusers.d/lightdm.conf + install -Dm00644 $pkgfiles/lightdm.tmpfiles $installdir/%libdir%/tmpfiles.d/lightdm.conf + install -Dm00644 $pkgfiles/lightdm.sysusers $installdir/%libdir%/sysusers.d/lightdm.conf install -d $installdir/usr/share/defaults mv $installdir{,/usr/share/defaults}/etc - install -Dm 00644 $pkgfiles/lightdm.pam $installdir/usr/share/defaults/etc/pam.d/lightdm - install -Dm 00644 $pkgfiles/lightdm-greeter.pam $installdir/usr/share/defaults/etc/pam.d/lightdm-greeter + install -Dm00644 $pkgfiles/lightdm.pam $installdir/usr/share/defaults/etc/pam.d/lightdm + install -Dm00644 $pkgfiles/lightdm-greeter.pam $installdir/usr/share/defaults/etc/pam.d/lightdm-greeter diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -149,7 +149,7 @@ programming.devel - lightdm + lightdm /usr/include/lightdm-gobject-1/lightdm.h @@ -199,8 +199,8 @@ - - 2018-11-09 + + 2018-12-30 1.28.0 Packaging update F. von Gellhorn