From 039e2c13450f450ee0425875867bae2bcd0dc71c Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 30 Dec 2024 23:05:26 +0300 Subject: [PATCH] import xorg-x11-xinit-1.4.2-3.el10 --- .gitignore | 2 +- .xorg-x11-xinit.metadata | 2 +- SOURCES/Xclients | 5 ++- SOURCES/Xsession | 4 +-- SPECS/xorg-x11-xinit.spec | 65 ++++++++++++++++++++++++++++++--------- 5 files changed, 59 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 80fc6db..88335c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xinit-1.4.0.tar.bz2 +SOURCES/xinit-1.4.2.tar.xz diff --git a/.xorg-x11-xinit.metadata b/.xorg-x11-xinit.metadata index 26c041d..6995171 100644 --- a/.xorg-x11-xinit.metadata +++ b/.xorg-x11-xinit.metadata @@ -1 +1 @@ -fcdca692b09a45f546016fff78718d1cf7e7852f SOURCES/xinit-1.4.0.tar.bz2 +588004f25911385ad206a94f21b4183b446664ab SOURCES/xinit-1.4.2.tar.xz diff --git a/SOURCES/Xclients b/SOURCES/Xclients index 1d6d6f7..fdebe8f 100644 --- a/SOURCES/Xclients +++ b/SOURCES/Xclients @@ -10,7 +10,7 @@ GSESSION="$(type -p gnome-session)" MSESSION="$(type -p mate-session)" -STARTKDE="$(type -p startkde)" +STARTKDE="$(type -p startplasma-x11)" STARTLXDE="$(type -p startlxde)" # check to see if the user has a preferred desktop @@ -38,6 +38,9 @@ fi if [ -n "$GSESSION" ]; then # by default, we run GNOME. exec "$GSESSION" +elif [ -n "$MSESSION" ]; then + # if GNOME isn't installed, try MATE + exec "$MSESSION" elif [ -n "$STARTKDE" ]; then # if GNOME isn't installed, try KDE. exec "$STARTKDE" diff --git a/SOURCES/Xsession b/SOURCES/Xsession index 2cffea1..85071ee 100644 --- a/SOURCES/Xsession +++ b/SOURCES/Xsession @@ -60,8 +60,8 @@ case $# in exec -l $SHELL -c gnome-session exec /bin/sh -c "exec -l $SHELL -c \"gnome-session\"" ;; - kde|kde1|kde2) - exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\"" + kde|kde1|kde2|kdeplasma) + exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startplasma-x11\"" ;; twm) # fall back to twm diff --git a/SPECS/xorg-x11-xinit.spec b/SPECS/xorg-x11-xinit.spec index 0e25dad..7d4cbd5 100644 --- a/SPECS/xorg-x11-xinit.spec +++ b/SPECS/xorg-x11-xinit.spec @@ -2,12 +2,12 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} -Version: 1.4.0 -Release: 11%{?dist} -License: MIT +Version: 1.4.2 +Release: 3%{?dist} +License: X11-distribute-modifications-variant AND MIT-open-group URL: https://www.x.org -Source0: https://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2 +Source0: https://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.xz Source10: xinitrc-common Source11: xinitrc Source12: Xclients @@ -47,7 +47,7 @@ BuildRequires: dbus-devel Requires: xorg-x11-xauth # next two are for localuser.sh Requires: coreutils -Requires: xhost +Requires: xhost xrdb setxkbmap xmodmap Provides: %{pkgname} = %{version} @@ -69,7 +69,7 @@ managers. %build %configure -make %{?_smp_mflags} +%make_build %install %make_install @@ -98,7 +98,7 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa } %files -%doc COPYING README ChangeLog +%doc COPYING README.md ChangeLog %{_bindir}/startx %{_bindir}/xinit %dir %{_sysconfdir}/X11/xinit @@ -119,12 +119,49 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa %{_datadir}/xsessions/xinit-compat.desktop %changelog -* Tue Aug 10 2021 Mohan Boddu - 1.4.0-11 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 30 2024 Arkady L. Shane - 1.4.2-3 +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Mohan Boddu - 1.4.0-10 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Mon Jun 24 2024 Troy Dawson - 1.4.2-3 +- Bump release for June 2024 mass rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Oct 05 2023 José Expósito - 1.4.2-1 +- xorg-x11-xinit 1.4.2 + +* Fri Sep 08 2023 Peter Hutterer - 1.4.0-19 +- SPDX migration + +* Sat Jul 22 2023 Fedora Release Engineering - 1.4.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 10 2023 Dominik Mierzejewski - 1.4.0-16 +- include MATE in Xclients fallback logic (#1517597) + +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Mar 25 2022 Peter Hutterer - 1.4.0-14 +- Require xmodmap, setxkbmap and xrdb after the xorg-x11-server-utils + deaggregation (#1961036). These are all (conditionally) invoked from + xinitrc-common. + +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Apr 30 2021 Rex Dieter - 1.4.0-11 +- use %%make_build + +* Thu Apr 29 2021 Neal Gompa - 1.4.0-10 +- Use correct binary for the KDE Plasma session (#1954847) * Thu Jan 28 2021 Fedora Release Engineering - 1.4.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -242,8 +279,8 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild * Mon Oct 01 2012 Kevin Fenzi 1.3.2-7 -- Add patch to not switch tty's, so systemd-logind works right with startx. -- Partially Fixes bug #806491 +- Add patch to not switch tty's, so systemd-logind works right with startx. +- Partially Fixes bug #806491 * Sun Jul 22 2012 Fedora Release Engineering - 1.3.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild