rpms/xorg-x11-xinit/devel xinit-1.0.9-unset.patch, NONE, 1.1 xorg-x11-xinit.spec, 1.65, 1.66
Matej Cepl
mcepl at fedoraproject.org
Mon Jun 8 21:09:25 UTC 2009
- Previous message (by thread): rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.64,1.65
- Next message (by thread): rpms/qca-gnupg/F-9 qca-gnupg-keyringmonitoring.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 qca-gnupg-includes.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mcepl
Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3167
Modified Files:
xorg-x11-xinit.spec
Added Files:
xinit-1.0.9-unset.patch
Log Message:
Add patches from F-11
xinit-1.0.9-unset.patch:
--- NEW FILE xinit-1.0.9-unset.patch ---
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
Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xorg-x11-xinit.spec 8 Jun 2009 20:58:22 -0000 1.65
+++ xorg-x11-xinit.spec 8 Jun 2009 21:08:54 -0000 1.66
@@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname}
Version: 1.0.9
-Release: 7%{?dist}
+Release: 9%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@@ -24,12 +24,14 @@ Source100: ck-xinit-session.c
Patch1: xinit-1.0.2-client-session.patch
Patch2: xinit-1.0.7-poke-ck.patch
+Patch3: xinit-1.0.9-unset.patch
BuildRequires: pkgconfig
BuildRequires: libX11-devel
BuildRequires: ConsoleKit-devel
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: dbus-devel
BuildRequires: libtool
BuildRequires: xorg-x11-util-macros
# NOTE: startx needs xauth in order to run, but that is not picked up
@@ -65,6 +67,7 @@ Allows legacy ~/.xsession and ~/.Xclient
%setup -q -n %{pkgname}-%{version}
%patch1 -p1 -b .client-session
#%patch2 -p1 -b .poke-ck
+%patch3 -p1 -b .unset
%build
autoreconf
@@ -73,9 +76,9 @@ autoreconf
# Makefile.am and submit it in a bug report or check into CVS.
make XINITDIR=/etc/X11/xinit
%{__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 \
- `pkg-config --libs ck-connector`
+ `pkg-config --libs ck-connector dbus-1`
%install
rm -rf $RPM_BUILD_ROOT
@@ -129,8 +132,19 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xsessions/xinit-compat.desktop
%changelog
-* Mon Jun 08 2009 MatÄj Cepl <mcepl at redhat.com> - 1.0.9-7
+* Mon Jun 08 2009 MatÄj Cepl <mcepl at redhat.com> - 1.0.9-9
- 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 at 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 at 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 at redhat.com> 1.0.9-6
- xinitrc-common: Load /etc/X11/Xresources with -nocpp
- Previous message (by thread): rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.64,1.65
- Next message (by thread): rpms/qca-gnupg/F-9 qca-gnupg-keyringmonitoring.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 qca-gnupg-includes.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list