From 02f9af916f9190f6eba1a779e27850d2fe11c42e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sep 06 2013 13:50:48 +0000 Subject: 1.7.12 (#1001101) --- diff --git a/.gitignore b/.gitignore index 032d70b..dbba77c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/lightdm-1.6.0.tar.xz -/lightdm-1.7.9.tar.xz -/lightdm-1.7.11.tar.xz +/lightdm-1.7.12.tar.xz diff --git a/lightdm-1.7.12-fedora_config.patch b/lightdm-1.7.12-fedora_config.patch new file mode 100644 index 0000000..c647f73 --- /dev/null +++ b/lightdm-1.7.12-fedora_config.patch @@ -0,0 +1,55 @@ +diff -up lightdm-1.7.12/data/lightdm.conf.fedora_config lightdm-1.7.12/data/lightdm.conf +--- lightdm-1.7.12/data/lightdm.conf.fedora_config 2013-08-28 19:54:41.000000000 -0500 ++++ lightdm-1.7.12/data/lightdm.conf 2013-09-06 08:47:35.618183446 -0500 +@@ -20,9 +20,9 @@ + #start-default-seat=true + #greeter-user=lightdm + #minimum-display-number=0 +-#minimum-vt=7 ++minimum-vt=1 + #lock-memory=true +-#user-authority-in-system-dir=false ++user-authority-in-system-dir=true + #guest-account-script=guest-account + #log-directory=/var/log/lightdm + #run-directory=/var/run/lightdm +@@ -71,7 +71,7 @@ + [SeatDefaults] + #type=xlocal + #xdg-seat=seat0 +-#xserver-command=X ++xserver-command=X -background none + #xserver-layout= + #xserver-config= + #xserver-allow-tcp=false +@@ -79,9 +79,7 @@ + #xdmcp-manager= + #xdmcp-port=177 + #xdmcp-key= +-#unity-compositor-command=unity-system-compositor +-#unity-compositor-timeout=60 +-#greeter-session=example-gtk-gnome ++greeter-session=lightdm-greeter + #greeter-hide-users=false + #greeter-allow-guest=true + #greeter-show-manual-login=false +@@ -89,7 +87,7 @@ + #user-session=default + #allow-guest=true + #guest-session=UNIMPLEMENTED +-#session-wrapper=lightdm-session ++session-wrapper=/etc/X11/xinit/Xsession + #greeter-wrapper= + #display-setup-script= + #greeter-setup-script= +diff -up lightdm-1.7.12/data/users.conf.fedora_config lightdm-1.7.12/data/users.conf +--- lightdm-1.7.12/data/users.conf.fedora_config 2013-07-30 09:09:28.000000000 -0500 ++++ lightdm-1.7.12/data/users.conf 2013-09-06 08:45:30.924515494 -0500 +@@ -9,6 +9,6 @@ + # hidden-shells = Shells that indicate a user cannot login + # + [UserAccounts] +-minimum-uid=500 ++minimum-uid=1000 + hidden-users=nobody nobody4 noaccess + hidden-shells=/bin/false /usr/sbin/nologin diff --git a/lightdm-1.7.9-fedora_config.patch b/lightdm-1.7.9-fedora_config.patch deleted file mode 100644 index 55b9408..0000000 --- a/lightdm-1.7.9-fedora_config.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up lightdm-1.7.9/data/lightdm.conf.fedora_config lightdm-1.7.9/data/lightdm.conf ---- lightdm-1.7.9/data/lightdm.conf.fedora_config 2013-07-30 09:09:28.000000000 -0500 -+++ lightdm-1.7.9/data/lightdm.conf 2013-08-03 08:36:55.215790032 -0500 -@@ -20,9 +20,9 @@ - #start-default-seat=true - #greeter-user=lightdm - #minimum-display-number=0 --#minimum-vt=7 -+minimum-vt=1 - #lock-memory=true --#user-authority-in-system-dir=false -+user-authority-in-system-dir=true - #guest-account-script=guest-account - #log-directory=/var/log/lightdm - #run-directory=/var/run/lightdm -@@ -69,7 +67,7 @@ - # - [SeatDefaults] - #type=xlocal --#xserver-command=X -+xserver-command=X -background none - #xserver-layout= - #xserver-config= - #xserver-allow-tcp=false -@@ -77,9 +75,7 @@ - #xdmcp-manager= - #xdmcp-port=177 - #xdmcp-key= --#unity-compositor-command=unity-system-compositor --#unity-compositor-timeout=60 --#greeter-session=example-gtk-gnome -+greeter-session=lightdm-greeter - #greeter-hide-users=false - #greeter-allow-guest=true - #greeter-show-manual-login=false -@@ -87,7 +83,7 @@ - #user-session=default - #allow-guest=true - #guest-session=UNIMPLEMENTED --#session-wrapper=lightdm-session -+session-wrapper=/etc/X11/xinit/Xsession - #greeter-wrapper= - #display-setup-script= - #greeter-setup-script= -diff -up lightdm-1.7.9/data/users.conf.fedora_config lightdm-1.7.9/data/users.conf ---- lightdm-1.7.9/data/users.conf.fedora_config 2013-07-30 09:09:28.000000000 -0500 -+++ lightdm-1.7.9/data/users.conf 2013-08-03 08:35:09.585900458 -0500 -@@ -9,6 +9,6 @@ - # hidden-shells = Shells that indicate a user cannot login - # - [UserAccounts] --minimum-uid=500 -+minimum-uid=1000 - hidden-users=nobody nobody4 noaccess - hidden-shells=/bin/false /usr/sbin/nologin diff --git a/lightdm.spec b/lightdm.spec index d6f805b..71e2530 100644 --- a/lightdm.spec +++ b/lightdm.spec @@ -8,14 +8,14 @@ Name: lightdm Summary: Lightweight Display Manager -Version: 1.7.11 -Release: 2%{?dist} +Version: 1.7.12 +Release: 1%{?dist} # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+ License: (LGPLv2 or LGPLv3) and GPLv3+ #URL: http://www.freedesktop.org/wiki/Software/LightDM URL: https://launchpad.net/lightdm/ -Source0: https://launchpad.net/lightdm/1.8/%{version}/+download/lightdm-%{version}.tar.xz +Source0: https://launchpad.net/lightdm/1.7/%{version}/+download/lightdm-%{version}.tar.xz Source1: lightdm.pam Source2: lightdm-autologin.pam @@ -25,7 +25,7 @@ Source6: lightdm.rules Patch0: lightdm-lock-screen-before-switch.patch ## Downstream patches: -Patch10: lightdm-1.7.9-fedora_config.patch +Patch10: lightdm-1.7.12-fedora_config.patch # hack in support for --nodaemon option Patch11: lightdm-nodaemon_option.patch # disable saving to ~/.dmrc @@ -261,6 +261,9 @@ fi %changelog +* Fri Sep 06 2013 Rex Dieter 1.7.12-1 +- 1.7.12 (#1001101) + * Tue Aug 27 2013 Rex Dieter 1.7.11-2 - rebase nodaemon_option.patch diff --git a/sources b/sources index 102ceb2..d8a8f92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cc23351c1e04dd9b4951ad1f7d3a1d3 lightdm-1.7.11.tar.xz +73d6a917ed667a45c194df6c4f270b80 lightdm-1.7.12.tar.xz