[packages/xorg-app-xinit] - updated to 1.4.2

[qboosh]

commit 12e347583b13c50f0b7789990d78f353f0d6f0dd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 29 20:16:50 2022 +0100

    - updated to 1.4.2

 xorg-app-xinit-xwrapper.patch |  9 ++++-----
 xorg-app-xinit.spec           | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/xorg-app-xinit.spec b/xorg-app-xinit.spec
index 582588f..a7f9ad1 100644
--- a/xorg-app-xinit.spec
+++ b/xorg-app-xinit.spec
@@ -1,12 +1,12 @@
 Summary:	xinit application - X Window System initializer
 Summary(pl.UTF-8):	Aplikacja xinit do uruchamiania X Window System
 Name:		xorg-app-xinit
-Version:	1.4.1
-Release:	2
+Version:	1.4.2
+Release:	1
 License:	MIT
 Group:		X11/Applications
-Source0:	https://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2
-# Source0-md5:	6d506ab2efc17a08e87778654e099d37
+Source0:	https://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.xz
+# Source0-md5:	0e9a1b9a82b84ab229c709c0f939c113
 Source1:	startx.1x.it
 Source2:	startx.1x.pl
 Source3:	xinit.1x.it
@@ -19,9 +19,11 @@ BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	cpp
 BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-proto-xproto-devel >= 7.0.17
 BuildRequires:	xorg-util-util-macros >= 1.19
+BuildRequires:	xz
 Requires:	xinitrc-ng
 Requires:	xorg-app-xauth
 Suggests:	ConsoleKit-x11
@@ -62,10 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/it/man1/startx.1x
-install -D %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/startx.1x
-install -D %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/it/man1/xinit.1x
-install -D %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/pl/man1/xinit.1x
+install -Dp %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/it/man1/startx.1x
+install -Dp %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/startx.1x
+install -Dp %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/it/man1/xinit.1x
+install -Dp %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/pl/man1/xinit.1x
 
 %{__rm} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc
 
diff --git a/xorg-app-xinit-xwrapper.patch b/xorg-app-xinit-xwrapper.patch
index f778431..c28ade2 100644
--- a/xorg-app-xinit-xwrapper.patch
+++ b/xorg-app-xinit-xwrapper.patch
@@ -10,11 +10,10 @@ diff -urNp -x '*.orig' xinit-1.4.1.org/Makefile.am xinit-1.4.1/Makefile.am
  	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
  	-D__libexecdir__="$(libexecdir)" \
  	-D__bindir__="$(bindir)" \
-diff -urNp -x '*.orig' xinit-1.4.1.org/startx.cpp xinit-1.4.1/startx.cpp
---- xinit-1.4.1.org/startx.cpp	2019-03-03 19:58:11.000000000 +0000
-+++ xinit-1.4.1/startx.cpp	2022-04-06 18:27:19.734543460 +0000
-@@ -53,7 +53,7 @@ sysclientrc=XINITDIR/xinitrc
- userserverrc=$HOME/.xserverrc
+--- xinit-1.4.2/startx.cpp.orig	2022-12-29 20:14:29.369817248 +0100
++++ xinit-1.4.2/startx.cpp	2022-12-29 20:15:04.276294810 +0100
+@@ -55,7 +55,7 @@ userserverrc=$HOME/.xserverrc
+ [ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}"
  sysserverrc=XINITDIR/xserverrc
  defaultclient=XTERM
 -defaultserver=XSERVER
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xinit.git/commitdiff/12e347583b13c50f0b7789990d78f353f0d6f0dd