Attachment 151481 Details for Bug 233183 – Updated spec file changes

[patch] Updated spec file changes

xorg-x11-xinit-spec-changes-3.patch (text/plain), 1.67 KB, created by David Zeuthen on 2007-04-02 21:29:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Zeuthen

Created: 2007-04-02 21:29:38 UTC

Size: 1.67 KB

patch

obsolete

>--- xorg-x11-xinit.spec.orig	2007-04-02 17:18:13.000000000 -0400
>+++ xorg-x11-xinit.spec	2007-04-02 17:27:49.000000000 -0400
>@@ -3,7 +3,7 @@
> Summary:   X.Org X11 X Window System xinit startup scripts
> Name:      xorg-x11-%{pkgname}
> Version:   1.0.2
>-Release:   15%{?dist}
>+Release:   16%{?dist}
> License:   MIT/X11
> Group:     User Interface/X
> URL:       http://www.x.org
>@@ -23,15 +23,22 @@
> 
> Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xinit-1.0.2-setuid.diff
> Patch1: xinit-1.0.2-client-session.patch
>+Patch2: xinit-1.0.2-2-poke-ck.patch
> 
> BuildRequires: pkgconfig
> BuildRequires: libX11-devel
>+BuildRequires: ConsoleKit-devel
>+BuildRequires: autoconf
>+BuildRequires: automake
>+BuildRequires: libtool
> # NOTE: startx needs xauth in order to run, but that is not picked up
> #       automatically by rpm.  (Bug #173684)
> Requires: xauth
> # next two are for localuser.sh
> Requires: coreutils
> Requires: xorg-x11-server-utils
>+Requires: ConsoleKit-x11
>+Requires: ConsoleKit-libs
> 
> # NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
> # modularization.  These Obsoletes lines ensure upgrades work smoothly.
>@@ -49,8 +56,10 @@
> %setup -q -n %{pkgname}-%{version}
> %patch0 -p0 -b .setuid
> %patch1 -p1 -b .client-session
>+%patch2 -p1 -b .poke-ck
> 
> %build
>+autoreconf
> %configure
> # 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.
>@@ -102,6 +111,9 @@
> %{_mandir}/man1/xinit.1x*
> 
> %changelog
>+* Mon Apr 02 2007 David Zeuthen <davidz@redhat.com> 1.0.2-16
>+- Add ConsoleKit support (#233183)
>+
> * Mon Nov 27 2006 Adam Jackson <ajax@redhat.com> 1.0.2-15
> - Bump EVR to fix 6 to 7 updates.
>

Actions: View | Diff

Attachments on bug 233183: 151476 | 151478 | 151479 | 151481