From 7d6ebea3ac1e0eda844520aa2daf3605f096a098ddde84dd193d2732fa5945f9 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 21 Sep 2011 15:59:55 +0000
Subject: [PATCH] Accepting request 84166 from
 home:eeich:branches:GNOME:Factory

- Don't use %{_libexecdir} for init script path, it's not uniformly
  defined on all supported products.

- Change %{_libdir} to ${_libexecdir}.

OBS-URL: https://build.opensuse.org/request/show/84166
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=180
---
 gdm.changes | 11 +++++++++++
 gdm.spec    |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 4cd1b5b..74462fd 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Sep 21 08:35:48 UTC 2011 - eich@suse.com
+
+- Don't use %{_libexecdir} for init script path, it's not uniformly 
+  defined on all supported products. 
+
+-------------------------------------------------------------------
+Tue Sep 20 15:54:37 UTC 2011 - eich@suse.com
+
+- Change %{_libdir} to ${_libexecdir}. 
+
 -------------------------------------------------------------------
 Fri Sep 16 13:29:15 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 57405cc..2f962a1 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -18,6 +18,7 @@
 
 # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
 %define enable_split_authentication 0
+%define _dminitdir %{_prefix}/lib/X11/displaymanagers
 
 Name:           gdm
 License:        GPLv2+
@@ -296,7 +297,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_
 mv $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver $RPM_BUILD_ROOT%{_libexecdir}/gdm/gdmflexiserver
 install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver
 # Install /etc/xinit.d/xdm integration script
-install -D -m 644 %{SOURCE5} %{buildroot}%{_libdir}/X11/displaymanagers/gdm
+install -D -m 644 %{SOURCE5} %{buildroot}%{_dminitdir}/gdm
 # Install other files
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/gdm
@@ -304,6 +305,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm
 %find_lang %{name} %{?no_lang_C}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -405,8 +407,8 @@ fi
 %{_sysconfdir}/dconf/db/gdm
 %{_sysconfdir}/dconf/profile/gdm
 # /etc/xinit.d/xdm integration
-%dir %{_libdir}/X11/displaymanagers
-%{_libdir}/X11/displaymanagers/gdm
+%dir %{_dminitdir}
+%{_dminitdir}/gdm
 # Exclude simple-greeter extensions
 %exclude %{_datadir}/gdm/simple-greeter/extensions