rpms/xorg-x11-xinit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patches from F-11

Browse Source
This commit is contained in:
Matej Cepl 2009-06-08 21:08:54 +00:00
parent 7c4ab39862
commit df2288b123
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xinit-1.0.9-unset.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up xinit-1.0.9/startx.cpp.jx xinit-1.0.9/startx.cpp
--- xinit-1.0.9/startx.cpp.jx 2008-05-21 14:29:51.000000000 -0400
+++ xinit-1.0.9/startx.cpp 2009-05-08 13:46:44.000000000 -0400
@@ -13,6 +13,7 @@ XCOMM Site administrators are STRONGLY u
XCOMM
XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
+unset XDG_SESSION_COOKIE
unset DBUS_SESSION_BUS_ADDRESS
unset SESSION_MANAGER

22
xorg-x11-xinit.spec
View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.9 Version: 1.0.9
Release: 7%{?dist} Release: 9%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -24,12 +24,14 @@ Source100: ck-xinit-session.c
Patch1: xinit-1.0.2-client-session.patch Patch1: xinit-1.0.2-client-session.patch
Patch2: xinit-1.0.7-poke-ck.patch Patch2: xinit-1.0.7-poke-ck.patch
Patch3: xinit-1.0.9-unset.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: ConsoleKit-devel BuildRequires: ConsoleKit-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: dbus-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-util-macros
# NOTE: startx needs xauth in order to run, but that is not picked up # NOTE: startx needs xauth in order to run, but that is not picked up
@ -65,6 +67,7 @@ Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers
%setup -q -n %{pkgname}-%{version} %setup -q -n %{pkgname}-%{version}
%patch1 -p1 -b .client-session %patch1 -p1 -b .client-session
#%patch2 -p1 -b .poke-ck #%patch2 -p1 -b .poke-ck
%patch3 -p1 -b .unset
%build %build
autoreconf autoreconf
@ -73,9 +76,9 @@ autoreconf
# Makefile.am and submit it in a bug report or check into CVS. # Makefile.am and submit it in a bug report or check into CVS.
make XINITDIR=/etc/X11/xinit make XINITDIR=/etc/X11/xinit
%{__cc} -o ck-xinit-session \ %{__cc} -o ck-xinit-session \
`pkg-config --cflags ck-connector` $RPM_OPT_FLAGS \ `pkg-config --cflags ck-connector dbus-1` $RPM_OPT_FLAGS \
$RPM_SOURCE_DIR/ck-xinit-session.c \ $RPM_SOURCE_DIR/ck-xinit-session.c \
`pkg-config --libs ck-connector` `pkg-config --libs ck-connector dbus-1`
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -129,8 +132,19 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xsessions/xinit-compat.desktop %{_datadir}/xsessions/xinit-compat.desktop
%changelog %changelog
* Mon Jun 08 2009 Matěj Cepl <mcepl@redhat.com> - 1.0.9-7 * Mon Jun 08 2009 Matěj Cepl <mcepl@redhat.com> - 1.0.9-9
- consider scripts in /etc/X11/xinit/Xclients.d/ as well - consider scripts in /etc/X11/xinit/Xclients.d/ as well
- add back scripts in Release -7 and -8 from F11 branch.
* Fri May 22 2009 Nalin Dahyabhai <nalin@redhat.com> 1.0.9-8
- have ck-xinit-session tell the session bus to set
XDG_SESSION_COOKIE for services which it autostarts (#502258)
- add direct build dependency on dbus-devel, since we call it
directly now
* Fri May 08 2009 Adam Jackson <ajax@redhat.com> 1.0.9-7
- xinit-1.0.9-unset.patch: Also unset XDG_SESSION_COOKIE in
startx. (#489999)
* Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.0.9-6 * Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.0.9-6
- xinitrc-common: Load /etc/X11/Xresources with -nocpp - xinitrc-common: Load /etc/X11/Xresources with -nocpp