|
 |
b9ec32 |
%global pkgname xinit
|
|
|
b9ec32 |
|
|
|
b9ec32 |
Summary: X.Org X11 X Window System xinit startup scripts
|
|
|
b9ec32 |
Name: xorg-x11-%{pkgname}
|
|
|
b9ec32 |
Version: 1.3.4
|
|
|
b9ec32 |
Release: 18%{?dist}
|
|
|
b9ec32 |
License: MIT
|
|
|
b9ec32 |
URL: http://www.x.org
|
|
|
b9ec32 |
|
|
|
b9ec32 |
Source0: http://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2
|
|
|
b9ec32 |
Source10: xinitrc-common
|
|
|
b9ec32 |
Source11: xinitrc
|
|
|
b9ec32 |
Source12: Xclients
|
|
|
b9ec32 |
Source13: Xmodmap
|
|
|
b9ec32 |
Source14: Xresources
|
|
|
b9ec32 |
# NOTE: Xsession is used by xdm/kdm/gdm and possibly others, so we keep it
|
|
|
b9ec32 |
# here instead of the xdm package.
|
|
|
b9ec32 |
Source16: Xsession
|
|
|
b9ec32 |
Source17: localuser.sh
|
|
|
b9ec32 |
Source18: xinit-compat.desktop
|
|
|
b9ec32 |
Source19: xinit-compat
|
|
|
b9ec32 |
|
|
|
b9ec32 |
# Fedora specific patches
|
|
|
b9ec32 |
Patch1: xinit-1.0.2-client-session.patch
|
|
|
b9ec32 |
# A few fixes submitted upstream, rhbz#1177513, rhbz#1203780
|
|
|
b9ec32 |
Patch3: 0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch
|
|
|
b9ec32 |
Patch4: 0002-startx-Fix-startx-picking-an-already-used-display-nu.patch
|
|
|
b9ec32 |
Patch5: 0003-startx-Make-startx-auto-display-select-work-with-per.patch
|
|
|
b9ec32 |
# Fedora specific patch to match the similar patch in the xserver
|
|
|
b9ec32 |
Patch6: xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
|
|
|
b9ec32 |
|
|
|
b9ec32 |
BuildRequires: automake gcc
|
|
|
b9ec32 |
BuildRequires: pkgconfig(x11)
|
|
|
b9ec32 |
BuildRequires: dbus-devel
|
|
|
b9ec32 |
|
|
|
b9ec32 |
# NOTE: startx needs xauth in order to run, but that is not picked up
|
|
|
b9ec32 |
# automatically by rpm. (Bug #173684)
|
|
|
b9ec32 |
Requires: xorg-x11-xauth
|
|
|
b9ec32 |
# next two are for localuser.sh
|
|
|
b9ec32 |
Requires: coreutils
|
|
|
b9ec32 |
Requires: xhost
|
|
|
b9ec32 |
|
|
|
b9ec32 |
Provides: %{pkgname} = %{version}
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%description
|
|
|
b9ec32 |
X.Org X11 X Window System xinit startup scripts.
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%package session
|
|
|
b9ec32 |
Summary: Display manager support for ~/.xsession and ~/.Xclients
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%description session
|
|
|
b9ec32 |
Allows legacy ~/.xsession and ~/.Xclients files to be used from display
|
|
|
b9ec32 |
managers.
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%prep
|
|
|
b9ec32 |
%setup -q -n %{pkgname}-%{version}
|
|
|
b9ec32 |
%patch1 -p1
|
|
|
b9ec32 |
%patch3 -p1
|
|
|
b9ec32 |
%patch4 -p1
|
|
|
b9ec32 |
%patch5 -p1
|
|
|
b9ec32 |
%patch6 -p1
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%build
|
|
|
b9ec32 |
%configure
|
|
|
b9ec32 |
make %{?_smp_mflags}
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%install
|
|
|
b9ec32 |
%make_install
|
|
|
b9ec32 |
install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
|
|
|
b9ec32 |
|
|
|
b9ec32 |
# Install Red Hat custom xinitrc, etc.
|
|
|
b9ec32 |
{
|
|
|
b9ec32 |
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit
|
|
|
b9ec32 |
|
|
|
b9ec32 |
install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc-common
|
|
|
b9ec32 |
|
|
|
b9ec32 |
for script in %{SOURCE11} %{SOURCE12} %{SOURCE16} ; do
|
|
|
b9ec32 |
install -p -m 755 $script $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/${script##*/}
|
|
|
b9ec32 |
done
|
|
|
b9ec32 |
|
|
|
b9ec32 |
install -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/X11/Xmodmap
|
|
|
b9ec32 |
install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/X11/Xresources
|
|
|
b9ec32 |
|
|
|
b9ec32 |
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
|
|
|
b9ec32 |
install -p -m 755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
|
|
|
b9ec32 |
|
|
|
b9ec32 |
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d
|
|
|
b9ec32 |
|
|
|
b9ec32 |
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
|
|
|
b9ec32 |
install -p -m 755 %{SOURCE19} $RPM_BUILD_ROOT%{_libexecdir}
|
|
|
b9ec32 |
}
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%files
|
|
|
b9ec32 |
%doc COPYING README ChangeLog
|
|
|
b9ec32 |
%{_bindir}/startx
|
|
|
b9ec32 |
%{_bindir}/xinit
|
|
|
b9ec32 |
%dir %{_sysconfdir}/X11/xinit
|
|
|
b9ec32 |
%{_sysconfdir}/X11/xinit/xinitrc
|
|
|
b9ec32 |
%{_sysconfdir}/X11/xinit/xinitrc-common
|
|
|
b9ec32 |
%config(noreplace) %{_sysconfdir}/X11/Xmodmap
|
|
|
b9ec32 |
%config(noreplace) %{_sysconfdir}/X11/Xresources
|
|
|
b9ec32 |
%dir %{_sysconfdir}/X11/xinit/Xclients.d
|
|
|
b9ec32 |
%{_sysconfdir}/X11/xinit/Xclients
|
|
|
b9ec32 |
%{_sysconfdir}/X11/xinit/Xsession
|
|
|
b9ec32 |
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
|
|
|
b9ec32 |
%{_sysconfdir}/X11/xinit/xinitrc.d/*
|
|
|
b9ec32 |
%{_mandir}/man1/startx.1*
|
|
|
b9ec32 |
%{_mandir}/man1/xinit.1*
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%files session
|
|
|
b9ec32 |
%{_libexecdir}/xinit-compat
|
|
|
b9ec32 |
%{_datadir}/xsessions/xinit-compat.desktop
|
|
|
b9ec32 |
|
|
|
b9ec32 |
%changelog
|
|
|
b9ec32 |
* Mon Feb 19 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.3.4-18
|
|
|
b9ec32 |
- Add BR for automake and gcc
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-17
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-16
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-15
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-14
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Wed Dec 14 2016 Hans de Goede <hdegoede@redhat.com> - 1.3.4-13
|
|
|
b9ec32 |
- Check for all 3 of SSH_AGENT, SSH_AGENT_PID and SSH_AUTH_SOCK to fix
|
|
|
b9ec32 |
a regression introduced by the previous fix (rhbz#1352339)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Mon Aug 29 2016 Hans de Goede <hdegoede@redhat.com> - 1.3.4-12
|
|
|
b9ec32 |
- Drop 0001-startx-Pass-nolisten-tcp-by-default.patch this is the
|
|
|
b9ec32 |
server default now
|
|
|
b9ec32 |
- Check for SSH_AUTH_SOCK not SSH_AGENT in xinitrc-common (rhbz#1352339)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-11
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Wed Jan 20 2016 Peter Hutterer <peter.hutterer@redhat.com>
|
|
|
b9ec32 |
- s/define/global/
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.4-10
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Mon May 18 2015 Hans de Goede <hdegoede@redhat.com> - 1.3.4-9
|
|
|
b9ec32 |
- Fix typo in Xsession file (rhbz#1222299)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Apr 30 2015 Hans de Goede <hdegoede@redhat.com> - 1.3.4-8
|
|
|
b9ec32 |
- Only set XORG_RUN_AS_USER_OK when no vt is specified (#1203780)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Fri Mar 20 2015 Hans de Goede <hdegoede@redhat.com> - 1.3.4-7
|
|
|
b9ec32 |
- Fix startx auto display select not working when a Xserver started by
|
|
|
b9ec32 |
gdm is running
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Wed Mar 18 2015 Hans de Goede <hdegoede@redhat.com> - 1.3.4-6
|
|
|
b9ec32 |
- Set XORG_RUN_AS_USER_OK when starting X on the current tty, to run X
|
|
|
b9ec32 |
to run without root rights when possible
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.3.4-5
|
|
|
b9ec32 |
- Rebuilt for Fedora 23 Change
|
|
|
b9ec32 |
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Tue Feb 3 2015 Hans de Goede <hdegoede@redhat.com> - 1.3.4-4
|
|
|
b9ec32 |
- xinitrc-common: Do not override SSH_AGENT if already set (rhbz#1067676)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Jan 22 2015 Simone Caronni <negativo17@gmail.com> - 1.3.4-3
|
|
|
b9ec32 |
- Xorg without root rights breaks by streams redirection (#1177513).
|
|
|
b9ec32 |
- Format SPEC file; trim changelog.
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Wed Oct 1 2014 Hans de Goede <hdegoede@redhat.com> - 1.3.4-2
|
|
|
b9ec32 |
- Add support for MATE to Xclients (#1147905)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Sep 11 2014 Hans de Goede <hdegoede@redhat.com> - 1.3.4-1
|
|
|
b9ec32 |
- New upstream release 1.3.4
|
|
|
b9ec32 |
- Resolves #806491 #990213 #1006029
|
|
|
b9ec32 |
- Remove stale ck-xinit-session references from xinitrc-common (#910969)
|
|
|
b9ec32 |
- Make startx pass "-nolisten tcp" by default, use -listen as server
|
|
|
b9ec32 |
option to disable this (#1111684)
|
|
|
b9ec32 |
- Teach Xclients script about lxde (#488602)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-13
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-12
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Tue Mar 25 2014 Hans de Goede <hdegoede@redhat.com> - 1.3.2-11
|
|
|
b9ec32 |
- Fix startx ignoring a server or display passed on the cmdline (#960955)
|
|
|
b9ec32 |
- Drop Fedora custom patch to unset XDG_SESSION_COOKIE, this was only for CK
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Jan 23 2014 Dave Airlie <airlied@redhat.com> 1.3.2-10
|
|
|
b9ec32 |
- fix for ppc64le enable (#1056742)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-9
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-8
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Mon Oct 01 2012 Kevin Fenzi <kevin@scrye.com> 1.3.2-7
|
|
|
b9ec32 |
- Add patch to not switch tty's, so systemd-logind works right with startx.
|
|
|
b9ec32 |
- Partially Fixes bug #806491
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-6
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Apr 26 2012 Adam Jackson <ajax@redhat.com> 1.3.2-5
|
|
|
b9ec32 |
- xinit 1.3.2
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Thu Mar 08 2012 Adam Jackson <ajax@redhat.com> 1.3.1-5
|
|
|
b9ec32 |
- Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-3
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Wed Nov 16 2011 Adam Jackson <ajax@redhat.com> 1.3.1-2
|
|
|
b9ec32 |
- Drop ConsoleKit integration, being removed in F17
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Mon Jul 25 2011 Matěj Cepl <mcepl@redhat.com> - 1.3.1-1
|
|
|
b9ec32 |
- New upstream version. Patches updated.
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Sat May 28 2011 Matěj Cepl <mcepl@redhat.com> - 1.0.9-21
|
|
|
b9ec32 |
- xinitrc-common sources ~/.profile (Bug 551508)
|
|
|
b9ec32 |
|
|
|
b9ec32 |
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-20
|
|
|
b9ec32 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|