From da6077e639c18e7d44131567db2639515531a74f1668773ce91bff6363c074aa Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 28 Apr 2014 02:12:11 +0000 Subject: [PATCH 1/8] - fixed build on openSUSE 12.3 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=66 --- xdm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdm.spec b/xdm.spec index 0471f7f..c35e696 100644 --- a/xdm.spec +++ b/xdm.spec @@ -16,7 +16,7 @@ # -%if 0%{?suse_version} > 1220 +%if 0%{?suse_version} > 1230 %define with_systemd 1 %else %define with_systemd 0 From c8289a687ca28911c8ca5d4fe276bf428df5db383fb63ea615fb575226182231 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 9 May 2014 12:28:25 +0000 Subject: [PATCH 2/8] Accepting request 233241 from home:a_jaeger:FactoryFix Use /run/ instead of /var/run. OBS-URL: https://build.opensuse.org/request/show/233241 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=67 --- xdm.changes | 5 +++++ xdm.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/xdm.changes b/xdm.changes index 0a9ce12..a20a329 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 9 11:59:21 UTC 2014 - aj@suse.com + +- Use /run/ instead of /var/run. + ------------------------------------------------------------------- Mon Mar 24 12:01:16 UTC 2014 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index c35e696..bdbb3bf 100644 --- a/xdm.spec +++ b/xdm.spec @@ -208,7 +208,11 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors +%if %with_systemd +%ghost /run/xdm.pid +%else %ghost %{_localstatedir}/run/xdm.pid +%endif %{_bindir}/chooser %{_bindir}/xdm %{_bindir}/xdmshell From 5f15725d827978ddbb53fa479c8623f1abf88f187c5528220c303938743b30a5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 9 May 2014 12:48:42 +0000 Subject: [PATCH 3/8] - revert latest change by aj, which broke the build OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=68 --- xdm.changes | 5 ----- xdm.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/xdm.changes b/xdm.changes index a20a329..0a9ce12 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri May 9 11:59:21 UTC 2014 - aj@suse.com - -- Use /run/ instead of /var/run. - ------------------------------------------------------------------- Mon Mar 24 12:01:16 UTC 2014 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index bdbb3bf..c35e696 100644 --- a/xdm.spec +++ b/xdm.spec @@ -208,11 +208,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors -%if %with_systemd -%ghost /run/xdm.pid -%else %ghost %{_localstatedir}/run/xdm.pid -%endif %{_bindir}/chooser %{_bindir}/xdm %{_bindir}/xdmshell From 2f9c54ab06ffee6ad28aa6a43ae20e08f4b66f964ce8ce86f232747c18644bb9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 13 May 2014 10:13:42 +0000 Subject: [PATCH 4/8] Accepting request 233661 from openSUSE:Factory:Staging:A - just don't "package" pid file. It's called xdm.pid, so it's pretty obvious what package it is from OBS-URL: https://build.opensuse.org/request/show/233661 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=69 --- xdm.changes | 6 ++++++ xdm.spec | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xdm.changes b/xdm.changes index 0a9ce12..f326a94 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 13 05:31:18 UTC 2014 - coolo@suse.com + +- just don't "package" pid file. It's called xdm.pid, so it's pretty + obvious what package it is from + ------------------------------------------------------------------- Mon Mar 24 12:01:16 UTC 2014 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index c35e696..dc5e70a 100644 --- a/xdm.spec +++ b/xdm.spec @@ -208,7 +208,6 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors -%ghost %{_localstatedir}/run/xdm.pid %{_bindir}/chooser %{_bindir}/xdm %{_bindir}/xdmshell From 57fc45cb8835d274ed3dbaedf1a79841d37398debb85a266a90e7e7388cc84e1 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 13 May 2014 10:40:43 +0000 Subject: [PATCH 5/8] revert latest and broken change by Coolo OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=70 --- xdm.changes | 6 ------ xdm.spec | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/xdm.changes b/xdm.changes index f326a94..0a9ce12 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue May 13 05:31:18 UTC 2014 - coolo@suse.com - -- just don't "package" pid file. It's called xdm.pid, so it's pretty - obvious what package it is from - ------------------------------------------------------------------- Mon Mar 24 12:01:16 UTC 2014 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index dc5e70a..c35e696 100644 --- a/xdm.spec +++ b/xdm.spec @@ -208,6 +208,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors +%ghost %{_localstatedir}/run/xdm.pid %{_bindir}/chooser %{_bindir}/xdm %{_bindir}/xdmshell From 99a8ebf01a00cee403874a7bf94dd28311e6ebccf6c5c41265f8908b80f55090 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 13 May 2014 12:37:22 +0000 Subject: [PATCH 6/8] Accepting request 233698 from openSUSE:Factory:Staging:A next try - this time it builds for sure for 13.1 and for factory OBS-URL: https://build.opensuse.org/request/show/233698 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=71 --- xdm.changes | 7 +++++++ xdm.spec | 1 - xdm.tar.bz2 | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xdm.changes b/xdm.changes index 0a9ce12..669eaa3 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 13 05:31:18 UTC 2014 - coolo@suse.com + +- just don't "package" pid file. It's called xdm.pid, so it's pretty + obvious what package it is from +- take the pid file out of the xdm.tar + ------------------------------------------------------------------- Mon Mar 24 12:01:16 UTC 2014 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index c35e696..dc5e70a 100644 --- a/xdm.spec +++ b/xdm.spec @@ -208,7 +208,6 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors -%ghost %{_localstatedir}/run/xdm.pid %{_bindir}/chooser %{_bindir}/xdm %{_bindir}/xdmshell diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 47a4e45..ed79056 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b26b384c510a6db57f56829648395ae72b5edd8dcc2abda2ed430ec97f2266a -size 20485 +oid sha256:1205abee56cf3e832c7f498042ebaa8138411ecba2fb29c0bd8aee9205c0af44 +size 21314 From b2a42bc44b4ca451db60cb04476b6916bd858cd6c52d26d6b8ef3208bcfdb65f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 15 May 2014 10:31:19 +0000 Subject: [PATCH 7/8] Accepting request 233910 from home:a_richardson:kf5 On my system I start dbus-daemon with systemd --user with the command "/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation". This always creates the socket in /run/user/`id -u`/bus. However, sys.xsession always launches a new dbus-daemon even if I already exported DBUS_SESSION_BUS_ADDRESS. This socket will become the default dbus socket once systemd manages dbus. It doesn't change anything for users that don't launch dbus-daemon using system and it will probably be necessary to add this patch in the future anyway. OBS-URL: https://build.opensuse.org/request/show/233910 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=72 --- xdm.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index ed79056..c4e191c 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1205abee56cf3e832c7f498042ebaa8138411ecba2fb29c0bd8aee9205c0af44 -size 21314 +oid sha256:0c6a2d49c6568655157c3a0957a68396004cc2c5d261640faf0862778dd039a5 +size 20616 From 6e3a4eca67dcdcaea67ab33afdc1e266dc1044dc27f86dd27c9dee09ba7a1d61 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 15 May 2014 11:55:41 +0000 Subject: [PATCH 8/8] Accepting request 234155 from home:a_richardson:kf5 Add a changelog entry for my latest submit request OBS-URL: https://build.opensuse.org/request/show/234155 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=73 --- xdm.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xdm.changes b/xdm.changes index 669eaa3..a8159cc 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 15 11:01:55 UTC 2014 - arichardson.kde@gmail.com + +- Don't run dbus-launch if the socket /run/user//bus exists, since + this means that dbus is already handled by systemd + ------------------------------------------------------------------- Tue May 13 05:31:18 UTC 2014 - coolo@suse.com