diff --git a/xinit-1.4.1.tar.bz2 b/xinit-1.4.1.tar.bz2 deleted file mode 100644 index 9492061..0000000 --- a/xinit-1.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 -size 176206 diff --git a/xinit-1.4.2.tar.xz b/xinit-1.4.2.tar.xz new file mode 100644 index 0000000..e6cefda --- /dev/null +++ b/xinit-1.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23 +size 156728 diff --git a/xinit-nolonger-unset-dbus-session.patch b/xinit-nolonger-unset-dbus-session.patch deleted file mode 100644 index 59dc439..0000000 --- a/xinit-nolonger-unset-dbus-session.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xinit-1.4.0/startx.cpp.old 2018-09-15 15:37:45.914382000 +0200 -+++ xinit-1.4.0/startx.cpp 2018-09-15 15:38:02.919921000 +0200 -@@ -11,7 +11,6 @@ - XCOMM Site administrators are STRONGLY urged to write nicer versions. - XCOMM - --unset DBUS_SESSION_BUS_ADDRESS - unset SESSION_MANAGER - - #ifdef __APPLE__ diff --git a/xinit-suse.patch b/xinit-suse.patch index 9f95998..92c9e70 100644 --- a/xinit-suse.patch +++ b/xinit-suse.patch @@ -2,8 +2,8 @@ Index: xinit-1.4.0/startx.cpp =================================================================== --- xinit-1.4.0.orig/startx.cpp 2018-03-10 02:46:03.000000000 +0100 +++ xinit-1.4.0/startx.cpp 2018-07-11 13:16:21.864694488 +0200 -@@ -50,10 +50,102 @@ - userclientrc=$HOME/.xinitrc +@@ -50,11 +50,103 @@ + [ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc +XCOMM @@ -97,6 +97,7 @@ Index: xinit-1.4.0/startx.cpp +. /etc/sysconfig/displaymanager + userserverrc=$HOME/.xserverrc + [ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" sysserverrc=XINITDIR/xserverrc defaultclient=XTERM +XCOMM set X Server accordingly (Xorg/Xgl) diff --git a/xinit.changes b/xinit.changes index 04a1ef9..670c314 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Dec 4 22:01:40 UTC 2022 - Stefan Dirsch + +- Update to version 1.4.2 + * Fix spelling/wording issues + * gitlab CI: add a basic build test + * gitlab CI: stop requiring Signed-off-by in commits + * man page: Update remote display example from rsh to ssh + * Remove non-portable grep usage from startx + * Don't wait for X to finish starting if it has died + * stop unsetting DBUS_SESSION_BUS_ADDRESS variable + * darwin: Drop support for macOS 10.7 and earlier + * darwin: Ensure we launch the user startx from $HOME + * darwin: Specify +extension GLX when the user requests IGLX support + * darwin: Wait for font_cache to complete to avoid a race with `xset fb=` + * man: Restore non-SCO UNIX bits of the man page + * startx: use uname -n instead of hostname + * startx: Source XINITRC and XSERVERRC variables + * startx: don't attempt to catch SIGKILL +- supersedes xinit-nolonger-unset-dbus-session.patch +- refreshed xinit-suse.patch + ------------------------------------------------------------------- Wed Apr 21 09:10:30 UTC 2021 - Dirk Müller diff --git a/xinit.spec b/xinit.spec index 99c9e67..2c1fa59 100644 --- a/xinit.spec +++ b/xinit.spec @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,13 @@ %define UsrEtcMove 1 %endif Name: xinit -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: X Window System initializer License: MIT Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ -Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz Source1: xinit.tar.bz2 Source2: keygen.c Source3: keygen.1 @@ -34,7 +34,6 @@ Patch0: xinit.diff Patch1: xinit-client-session.patch Patch2: xinit-suse.patch Patch3: xinit-tolerant-hostname-changes.patch -Patch4: xinit-nolonger-unset-dbus-session.patch Patch5: xinit-tarball.patch # needed for patch0 BuildRequires: gcc-c++ @@ -72,7 +71,6 @@ sed -i 's+%{_sysconfdir}/X11+%{_libexecdir}+' %{PATCH0} %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 ### patch is applied later in %install section #%patch5 -p0 # needed for patch0