diff --git a/gdm-disable-journal.patch b/gdm-disable-journal.patch deleted file mode 100644 index 5609993..0000000 --- a/gdm-disable-journal.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: gdm-3.10.0.1/daemon/gdm-slave-proxy.c -=================================================================== ---- gdm-3.10.0.1.orig/daemon/gdm-slave-proxy.c -+++ gdm-3.10.0.1/daemon/gdm-slave-proxy.c -@@ -137,7 +137,7 @@ typedef struct { - static void - spawn_child_setup (SpawnChildData *data) - { --#ifdef WITH_SYSTEMD -+#ifdef WITH_SYSTEMD && ENABLE_SYSTEMD_JOURNAL - if (sd_booted () > 0) { - return; - } -@@ -185,7 +185,7 @@ spawn_command_line_async (const char *co - - data.identifier = argv[0]; - --#ifdef WITH_SYSTEMD -+#ifdef WITH_SYSTEMD && ENABLE_SYSTEMD_JOURNAL - if (sd_booted () > 0) { - has_journald = TRUE; - } diff --git a/gdm.changes b/gdm.changes index 8037bf5..7dde9c0 100644 --- a/gdm.changes +++ b/gdm.changes @@ -641,8 +641,6 @@ Fri Jun 20 09:35:25 UTC 2014 - fcrozat@suse.com ------------------------------------------------------------------- Wed May 28 11:26:21 UTC 2014 - fcrozat@suse.com -- Add gdm-disable-journal.patch: properly disable journald in all - gdm, if asked (bnc#867344). - Remove scrollkeeper configure flag, no longer exists. - Only build ConsoleKit support when not building systemd support. - Update gdm-launch-environment.pamd to not call pam_loginuid, it @@ -680,12 +678,6 @@ Wed Mar 26 18:45:34 UTC 2014 - zaitor@opensuse.org + Fix timed login. + Updated translations. -------------------------------------------------------------------- -Wed Mar 26 08:44:13 UTC 2014 - dliang@suse.com - -- Add --disable-systemd-journal in specfile for SLE to disable - journal support (bnc#867344). - ------------------------------------------------------------------- Thu Mar 20 08:28:44 UTC 2014 - dimstar@opensuse.org @@ -719,6 +711,7 @@ Fri Feb 21 19:45:07 UTC 2014 - dimstar@opensuse.org - Rebase gdm-desktop-session-env-pam.patch, gdm-passwordless-login.patch and gdm-sysconfig-settings.patch. - Disable gdm-xauthlocalhostname.patch: Needs rebasing. +- Drop gdm-disable-journal.patch: fixed in upstream. ------------------------------------------------------------------- Wed Jan 15 11:57:48 UTC 2014 - dimstar@opensuse.org @@ -760,6 +753,18 @@ Wed Nov 27 19:52:01 UTC 2013 - dimstar@opensuse.org addressing XDMCP related issues (bnc#851160, bgo#690926, bgo#711180). +------------------------------------------------------------------- +Wed Oct 16 17:47:46 UTC 2013 - fcrozat@suse.com + +- Add gdm-disable-journal.patch: properly disable journald in all + gdm, if asked (bnc#867344). + +------------------------------------------------------------------- +Wed Oct 16 17:47:46 UTC 2013 - dliang@suse.com + +- Add --disable-systemd-journal in specfile for SLE to disable + journal support (bnc#867344). + ------------------------------------------------------------------- Wed Oct 16 17:47:46 UTC 2013 - dimstar@opensuse.org diff --git a/gdm.spec b/gdm.spec index f979225..d865444 100644 --- a/gdm.spec +++ b/gdm.spec @@ -60,8 +60,6 @@ Patch35: gdm-xauthlocalhostname.patch Patch41: gdm-plymouth-vt1.patch # PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 bgo#769969 tyang@suse.com -- Gdm should stop after a few times fails Patch42: gdm-fails-to-restart-gnome-shell.patch -# PATCH-FIX-SLE gdm-disable-journal.patch bnc#867344 fcrozat@suse.com -- ensure journal is properly disabled everywhere -Patch43: gdm-disable-journal.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -193,9 +191,6 @@ translation-update-upstream %patch35 -p1 %patch41 -p1 %patch42 -p1 -%if ! 0%{?is_opensuse} -%patch43 -p1 -%endif %build NOCONFIGURE=1 sh autogen.sh