From 132d82e404563b29fcba23d7cc160b8c3ae0a4d5bda844720c4db2a7101985f8 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 7 Sep 2011 01:01:35 +0000
Subject: [PATCH] Accepting request 80483 from
 home:gberh:branches:GNOME:Factory

- moved gdmflxiserver to libexecdir and created a wrapper script in
  /usr/bin which is delivered in a subpackage and allows for
  alternative gdmflexiserver implementations of other display
  managers

OBS-URL: https://build.opensuse.org/request/show/80483
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=172
---
 gdm.changes       |  8 ++++++++
 gdm.spec          | 25 ++++++++++++++++++++++++-
 gdmflexiserver.sh |  3 +++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 gdmflexiserver.sh

diff --git a/gdm.changes b/gdm.changes
index 40c64f4..6b7623d 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug 31 15:15:06 UTC 2011 - gber@opensuse.org
+
+- moved gdmflxiserver to libexecdir and created a wrapper script in
+  /usr/bin which is delivered in a subpackage and allows for
+  alternative gdmflexiserver implementations of other display
+  managers
+
 -------------------------------------------------------------------
 Mon Jul 25 23:04:14 CEST 2011 - vuntz@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 51890ba..f54107c 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -28,6 +28,7 @@ Url:            http://projects.gnome.org/gdm/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
+Source3:        gdmflexiserver.sh
 # PATCH-FEATURE-UPSTREAM gdm-plymouth.patch vuntz@opensuse.org -- Get a nice transition from plymouth; taken from Fedora
 Patch0:         gdm-plymouth.patch
 # PATCH-FIX-UPSTREAM gdm-plymouth-X-nr.patch vuntz@opensuse.org -- Patch on top of the previous patch (we keep it separate so it's easy to sync with Fedora) to use -nr when starting X
@@ -93,6 +94,7 @@ Requires:       ConsoleKit-x11
 Requires:       gnome-session-core
 Requires:       klogd
 Requires:       xorg-x11-server-extra
+Requires:       gdmflexiserver
 # Packages for the gdm session (see /usr/share/gnome-session/sessions/gdm.session)
 Requires:       gnome-settings-daemon
 Requires:       metacity
@@ -153,6 +155,18 @@ providing graphical log-ins and managing local and remote displays.
 
 This package provides the upstream default configuration for gdm.
 
+%package -n gdmflexiserver
+License:        GPLv2+
+Summary:        gdmflexiserver Compatibility Wrapper
+Group:          System/GUI/GNOME
+BuildArch:      noarch
+
+%description -n gdmflexiserver
+This package provides a gdmflexiserver compatiblity wrapper which selects and
+executes the correct gdmflexiserver executable based on the running display
+manager.
+
+
 %lang_package
 %prep
 %setup -q
@@ -213,6 +227,9 @@ cp %{S:1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 cp %{S:2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 # Install PostLogin script.
 mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default
+# Move gdmflexiserver to libexecdir and replace it with the compatibility wrapper.
+mv $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver $RPM_BUILD_ROOT%{_libexecdir}/gdm/gdmflexiserver
+install -m 755 %{S:3} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver
 mkdir -p $RPM_BUILD_ROOT{_localstatedir}/log/gdm
 mkdir -p $RPM_BUILD_ROOT{_localstatedir}/run/gdm
 %find_lang %{name} %{?no_lang_C}
@@ -279,13 +296,15 @@ fi
 %dir %config %{_sysconfdir}/gdm
 %config %{_sysconfdir}/gdm/[IPXl]*
 %{_sbindir}/gdm
-%{_bindir}/*
+%{_bindir}/gdm
+%{_bindir}/gdm-screenshot
 %{_datadir}/gdm/
 %{_datadir}/gnome-session/sessions/gdm.session
 %{_datadir}/icons/*/*/*/*.*
 %{_datadir}/pixmaps/*.png
 %dir %{_libexecdir}/gdm
 %{_libexecdir}/gdm/gdm-*
+%{_libexecdir}/gdm/gdmflexiserver
 %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
 %ghost %attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm
 %attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm
@@ -324,6 +343,10 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/gdm/custom.conf
 
+%files -n gdmflexiserver
+%defattr(-,root,root)
+%{_bindir}/gdmflexiserver
+
 %files lang -f %{name}.lang
 
 %changelog
diff --git a/gdmflexiserver.sh b/gdmflexiserver.sh
new file mode 100644
index 0000000..34f796e
--- /dev/null
+++ b/gdmflexiserver.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec "${GDMFLEXISERVER:-/usr/lib/gdm/gdmflexiserver}"