diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec index 92d8d92..7f08be4 100644 --- a/xorg-x11-xinit.spec +++ b/xorg-x11-xinit.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -20,7 +20,6 @@ Source16: Xsession Source17: localuser.sh Source18: xinit-compat.desktop Source19: xinit-compat -Source100: ck-xinit-session.c # Fedora specific patches @@ -29,7 +28,6 @@ Patch3: xinit-1.0.9-unset.patch BuildRequires: pkgconfig BuildRequires: libX11-devel -BuildRequires: ConsoleKit-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: dbus-devel @@ -41,7 +39,6 @@ Requires: xorg-x11-xauth # next two are for localuser.sh Requires: coreutils Requires: xorg-x11-server-utils -Requires: ConsoleKit-x11 %package session Summary: Display manager support for ~/.xsession and ~/.Xclients @@ -64,16 +61,11 @@ autoreconf # FIXME: Upstream should default to XINITDIR being this. Make a patch to # Makefile.am and submit it in a bug report or check into CVS. make XINITDIR=%{_sysconfdir}/X11/xinit -%{__cc} -o ck-xinit-session \ - `pkg-config --cflags ck-connector dbus-1` $RPM_OPT_FLAGS \ - %{SOURCE100} \ - `pkg-config --libs ck-connector dbus-1` %install # FIXME: Upstream should default to XINITDIR being this. Make a patch to # Makefile.am and submit it in a bug report or check into CVS. make install DESTDIR=$RPM_BUILD_ROOT XINITDIR=%{_sysconfdir}/X11/xinit -install -p -m755 ck-xinit-session $RPM_BUILD_ROOT/%{_bindir} install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop # Install Red Hat custom xinitrc, etc. @@ -103,7 +95,6 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa %doc COPYING README ChangeLog %{_bindir}/startx %{_bindir}/xinit -%{_bindir}/ck-xinit-session %dir %{_sysconfdir}/X11/xinit %{_sysconfdir}/X11/xinit/xinitrc %{_sysconfdir}/X11/xinit/xinitrc-common @@ -123,6 +114,9 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa %{_datadir}/xsessions/xinit-compat.desktop %changelog +* Wed Nov 16 2011 Adam Jackson 1.3.1-2 +- Drop ConsoleKit integration, being removed in F17 + * Mon Jul 25 2011 Matěj Cepl - 1.3.1-1 - New upstream version. Patches updated.