From ea3c95a0f92ae27facd2d280e7904afeffaec60e34dae76d00a506a9e5917b7f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Jan 2013 20:16:48 +0000 Subject: [PATCH 1/2] Accepting request 150137 from home:rmilasan:branches:GNOME:Factory - Add gdm-move-everything-to-run.patch: move everything (socket and pid files) to /run. OBS-URL: https://build.opensuse.org/request/show/150137 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=233 --- gdm-move-everything-to-run.patch | 80 ++++++++++++++++++++++++++++++++ gdm.changes | 6 +++ gdm.spec | 3 ++ 3 files changed, 89 insertions(+) create mode 100644 gdm-move-everything-to-run.patch diff --git a/gdm-move-everything-to-run.patch b/gdm-move-everything-to-run.patch new file mode 100644 index 0000000..29546fc --- /dev/null +++ b/gdm-move-everything-to-run.patch @@ -0,0 +1,80 @@ +Index: gdm-3.6.2/configure +=================================================================== +--- gdm-3.6.2.orig/configure ++++ gdm-3.6.2/configure +@@ -26020,7 +26020,7 @@ fi + if ! test -z "$with_pid_file"; then + GDM_PID_FILE=$with_pid_file + else +- GDM_PID_FILE=/var/run/gdm.pid ++ GDM_PID_FILE=/run/gdm.pid + fi + + +@@ -26041,7 +26041,7 @@ fi + if ! test -z "$with_ran_once_marker_directory"; then + GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory + else +- GDM_RAN_ONCE_MARKER_DIR=${localstatedir}/run/gdm ++ GDM_RAN_ONCE_MARKER_DIR=/run/gdm + fi + + +@@ -26085,7 +26085,7 @@ fi + if ! test -z "$with_xauth_dir"; then + GDM_XAUTH_DIR=$with_xauth_dir + else +- GDM_XAUTH_DIR=${localstatedir}/run/gdm ++ GDM_XAUTH_DIR=/run/gdm + fi + + +@@ -26101,7 +26101,7 @@ fi + if ! test -z "$with_screenshot_dir"; then + GDM_SCREENSHOT_DIR=$with_screenshot_dir + else +- GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter ++ GDM_SCREENSHOT_DIR=/run/gdm/greeter + fi + + +Index: gdm-3.6.2/configure.ac +=================================================================== +--- gdm-3.6.2.orig/configure.ac ++++ gdm-3.6.2/configure.ac +@@ -1326,7 +1326,7 @@ AC_ARG_WITH(pid-file, + if ! test -z "$with_pid_file"; then + GDM_PID_FILE=$with_pid_file + else +- GDM_PID_FILE=/var/run/gdm.pid ++ GDM_PID_FILE=/run/gdm.pid + fi + + AC_SUBST(GDM_PID_FILE) +@@ -1343,7 +1343,7 @@ AC_ARG_WITH(ran-once-marker-directory, + if ! test -z "$with_ran_once_marker_directory"; then + GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory + else +- GDM_RAN_ONCE_MARKER_DIR=${localstatedir}/run/gdm ++ GDM_RAN_ONCE_MARKER_DIR=/run/gdm + fi + AC_SUBST(GDM_RAN_ONCE_MARKER_DIR) + AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_DIR, "$GDM_RAN_ONCE_MARKER_DIR", [ran once marker dir]) +@@ -1379,7 +1379,7 @@ AC_ARG_WITH(xauth-dir, + if ! test -z "$with_xauth_dir"; then + GDM_XAUTH_DIR=$with_xauth_dir + else +- GDM_XAUTH_DIR=${localstatedir}/run/gdm ++ GDM_XAUTH_DIR=/run/gdm + fi + + AC_SUBST(GDM_XAUTH_DIR) +@@ -1395,7 +1395,7 @@ AC_ARG_WITH(screenshot-dir, + if ! test -z "$with_screenshot_dir"; then + GDM_SCREENSHOT_DIR=$with_screenshot_dir + else +- GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter ++ GDM_SCREENSHOT_DIR=/run/gdm/greeter + fi + + AC_SUBST(GDM_SCREENSHOT_DIR) diff --git a/gdm.changes b/gdm.changes index dc23f29..ffbf23b 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 28 10:36:39 UTC 2013 - rmilasan@suse.com + +- Add gdm-move-everything-to-run.patch: move everything (socket and + pid files) to /run. + ------------------------------------------------------------------- Sun Jan 20 09:53:24 UTC 2013 - dimstar@opensuse.org diff --git a/gdm.spec b/gdm.spec index 447414a..de1a958 100644 --- a/gdm.spec +++ b/gdm.spec @@ -66,6 +66,8 @@ Patch35: gdm-xauthlocalhostname.patch Patch40: gdm-look-at-runlevel.patch # PATCH-FIX-UPSTREAM gdm-autologin-session-logout.patch bgo#682467 dimstar@opensuse.org -- Fix login after logging out from a auto-login session Patch41: gdm-autologin-session-logout.patch +# PATCH-FIX-OPENSUSE gdm-move-everything-to-run.patch rmilasan@suse.com -- Move everything (socket and pid files) to /run +Patch42: gdm-move-everything-to-run.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -237,6 +239,7 @@ translation-update-upstream %patch35 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %build NOCONFIGURE=1 gnome-autogen.sh From 04124e8319e24a2ff6cda62399f803e0e051ddf73424f6f4f0d3e1da646e9a8b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Jan 2013 20:33:21 +0000 Subject: [PATCH 2/2] Accepting request 150227 from home:dimstar:branches:GNOME:Factory Move files from /var/run to /run in accordance with systemd design OBS-URL: https://build.opensuse.org/request/show/150227 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=234 --- gdm.changes | 2 +- gdm.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdm.changes b/gdm.changes index ffbf23b..334ddb2 100644 --- a/gdm.changes +++ b/gdm.changes @@ -2,7 +2,7 @@ Mon Jan 28 10:36:39 UTC 2013 - rmilasan@suse.com - Add gdm-move-everything-to-run.patch: move everything (socket and - pid files) to /run. + pid files) to /run. ------------------------------------------------------------------- Sun Jan 20 09:53:24 UTC 2013 - dimstar@opensuse.org diff --git a/gdm.spec b/gdm.spec index de1a958..ac96962 100644 --- a/gdm.spec +++ b/gdm.spec @@ -66,7 +66,7 @@ Patch35: gdm-xauthlocalhostname.patch Patch40: gdm-look-at-runlevel.patch # PATCH-FIX-UPSTREAM gdm-autologin-session-logout.patch bgo#682467 dimstar@opensuse.org -- Fix login after logging out from a auto-login session Patch41: gdm-autologin-session-logout.patch -# PATCH-FIX-OPENSUSE gdm-move-everything-to-run.patch rmilasan@suse.com -- Move everything (socket and pid files) to /run +# PATCH-FIX-OPENSUSE gdm-move-everything-to-run.patch bgo#692733 rmilasan@suse.com -- Move everything (socket and pid files) to /run Patch42: gdm-move-everything-to-run.patch BuildRequires: check-devel # needed for directory ownership @@ -312,7 +312,7 @@ install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver install -D -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm # Install other files mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/gdm +mkdir -p $RPM_BUILD_ROOT/run/gdm mkdir -p $RPM_BUILD_ROOT%{_bindir} ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm %find_lang %{name} %{?no_lang_C} @@ -388,9 +388,9 @@ dconf update %{_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 %dir %{_localstatedir}/cache/gdm +%ghost %attr(751,gdm,gdm) %dir /run/gdm %config /etc/pam.d/gdm %config /etc/pam.d/gdm-autologin %config /etc/pam.d/gdm-fingerprint