From 65506c7fa8b3e6ce0afefcbc4a011ae1054af90e Mon Sep 17 00:00:00 2001
From: weidong <weidong@uniontech.com>
Date: Tue, 10 Nov 2020 14:20:51 +0800
Subject: [PATCH] sync spec

---
 xorg-x11-xinit.spec | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index 0eb73ae..678b467 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -1,10 +1,23 @@
 Name:         xorg-x11-xinit
 Version:      1.4.0
-Release:      5
+Release:      6
 Summary:      X.Org X11 X Window System xinit startup scripts
 License:      MIT
 URL:          https://www.x.org
 Source0:      https://xorg.freedesktop.org/archive/individual/app/xinit-%{version}.tar.bz2
+Source1:      xinitrc-common
+Source2:      xinitrc
+Source3:      Xclients
+Source4:      Xmodmap
+Source5:      Xresources
+Source6:      Xsession
+Source7:      localuser.sh
+Source8:      xinit-compat.desktop
+Source9:      xinit-compat
+
+Patch0000:    xinit-1.0.2-client-session.patch
+Patch0001:    0003-startx-Make-startx-auto-display-select-work-with-per.patch
+Patch0002:    xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
 
 BuildRequires:automake gcc gcc-c++ pkgconfig(x11) dbus-devel
 
@@ -31,19 +44,34 @@ Help document for th xorg-x11-xinit package.
 
 %install
 %make_install
+install -p -m644 -D %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc-common
+for script in %{SOURCE2} %{SOURCE3} %{SOURCE6} ; do
+     install -p -m 755 $script $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/${script##*/}
+done
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/X11/Xmodmap
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/Xresources
+install -D -p -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
 install -d %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d
+install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_libexecdir}/xinit-compat
 
 %files
 %doc COPYING README ChangeLog
 %{_bindir}/*
 %{_sysconfdir}/X11/xinit/*
 %config(noreplace) %{_sysconfdir}/X11/*
+%{_sysconfdir}/X11/xinit/xinitrc.d/*
+%{_libexecdir}/xinit-compat
+%{_datadir}/xsessions/xinit-compat.desktop
 
 %files help
 %{_mandir}/man1/startx.1*
 %{_mandir}/man1/xinit.1*
 
 %changelog
+* Thu Jul 30 2020 douyan <douyan@kylinos.cn> - 1.4.0-6
+- update spec, add xinitrc,Xsession file
+
 * Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.4.0-5
 - update spec