From 7903c93d2d5b4de2c9dc4c6c2156af0c8c444be66cc6dffee12c11b700f6715e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 22 Feb 2017 20:40:02 +0000
Subject: [PATCH] Accepting request 459796 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/459796
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=326
---
 gdm-3.22.1.tar.xz |  3 ---
 gdm-3.23.4.tar.xz |  3 +++
 gdm.changes       | 23 +++++++++++++++++++++++
 gdm.spec          | 13 +++++--------
 4 files changed, 31 insertions(+), 11 deletions(-)
 delete mode 100644 gdm-3.22.1.tar.xz
 create mode 100644 gdm-3.23.4.tar.xz

diff --git a/gdm-3.22.1.tar.xz b/gdm-3.22.1.tar.xz
deleted file mode 100644
index 9256e00..0000000
--- a/gdm-3.22.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a43e623f563c2e366297c2ee8d160526a285e102c73936e27a1d79076d6969f
-size 1110372
diff --git a/gdm-3.23.4.tar.xz b/gdm-3.23.4.tar.xz
new file mode 100644
index 0000000..3cfb47b
--- /dev/null
+++ b/gdm-3.23.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04643c6ffc659863d600d82aeffd57a4996e92ff39b327f4c9b8e6eab2ba7ed8
+size 1122000
diff --git a/gdm.changes b/gdm.changes
index aa9f7d2..4f2976c 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Jan 10 14:16:39 UTC 2017 - adrien.plazas@suse.com
+
+- Drop requirement on xorg-x11-server-extra: it provides Xdmx,
+  Xephyr and Xnest, which usage is strongly discouraged nowadays
+  since the protocols they implement are insecure and work badly on
+  GNOME 3. Other remoting protocols like VNC are recommended
+  instead.
+
+-------------------------------------------------------------------
+Mon Jan  9 11:03:14 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.23.4:
+  + Make X11DisplayName property accurate.
+  + Fix bug that forced wayland on second logins even if user
+    didn't pick it.
+  + Kill clients from display on logout (multiseat and xdmcp only).
+  + Send hangup to process group when session exits.
+  + Allow specifying pam_gdm install location to configure.
+- Pass --with-pam-mod-dir=/%{_lib}/security to configure: directly
+  install the pam module into the right location instead of moving
+  it there later on.
+
 -------------------------------------------------------------------
 Wed Oct 12 18:28:33 UTC 2016 - zaitor@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 3096833..7de4880 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,13 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.22.1
+Version:        3.23.4
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gdm/
-Source:         http://download.gnome.org/sources/gdm/3.22/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gdm/3.23/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-launch-environment.pamd
@@ -95,7 +95,6 @@ Requires:       gdmflexiserver
 Requires:       gnome-session-core
 Requires:       gnome-settings-daemon
 Requires:       gnome-shell
-Requires:       xorg-x11-server-extra
 Requires(post): dconf
 # accessibility
 Recommends:     orca
@@ -204,6 +203,7 @@ NOCONFIGURE=1 sh autogen.sh
         --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
         --with-check-accelerated-directory=%{_libexecdir} \
         --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon-3.0 \
+        --with-pam-mod-dir=/%{_lib}/security \
         --enable-ipv6 \
         --enable-gdm-xsession \
         --with-plymouth \
@@ -224,7 +224,7 @@ NOCONFIGURE=1 sh autogen.sh
 
 %install
 %make_install
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+find %{buildroot} -name '*.la' -type f -delete -print
 # Do not ship the systemd.service file: openSUSE uses xdm, which enables the DM based on sysconfig.
 rm %{buildroot}%{systemdsystemunitdir}/gdm.service
 ## Install PAM files.
@@ -248,9 +248,6 @@ echo "We are not ready for this, we need to know what to put in gdm-fingerprint
 false
 %endif
 ln -s gdm $RPM_BUILD_ROOT/etc/pam.d/gdm-password
-# move the pam module out of _prefix
-mkdir -p %{buildroot}/%{_lib}/security
-mv %{buildroot}%{_libdir}/security/pam_gdm.so %{buildroot}/%{_lib}/security/
 ## Install other files
 # Install PostLogin script.
 mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default