Attachment 309612 Details for Bug 451789 – vnc-crm1825054.spec.patch

vnc-crm1825054.spec.patch

vnc-crm1825054.spec.patch (text/x-patch), 3.26 KB, created by Alan Matsuoka on 2008-06-17 13:13:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Matsuoka

Created: 2008-06-17 13:13:04 UTC

Size: 3.26 KB

patch

obsolete

>--- vnc.spec	2007-01-15 15:29:27.000000000 +0000
>+++ vnc-crm1825054.spec	2008-06-14 02:48:39.000000000 +0100
>@@ -5,7 +5,7 @@
> Summary:   A remote display system.
> Name:      vnc
> Version:   4.1.2
>-Release:   9%{?dist}
>+Release:   9crm1825054%{?dist}
> URL:       http://www.realvnc.com
> Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
> Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
>@@ -41,6 +41,11 @@ Patch22:   vnc-config.patch
> Patch23:   vnc-render.patch
> Patch24:   vnc-ipv6.patch
> Patch25:   vnc-render-sigfault.patch
>+
>+# Fix for CRM#1825054 - ofourdan
>+Patch26:  vnc-xorg-x11-server-1.1.1-mesa-6.5.1.patch
>+Patch27:  vnc-xorg-x11-server-1.1.1-selinux-awareness.patch
>+
> License:   GPL
> Group:     User Interface/Desktops
> BuildRoot: %{_tmppath}/%{name}-%{version}-root
>@@ -56,7 +61,7 @@ BuildRequires: xorg-x11-proto-devel, lib
> BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros
> BuildRequires: libXt-devel
> %ifnarch s390 s390x ppc64
>-BuildRequires: libdrm-devel
>+BuildRequires: mesa-libGL-devel, mesa-source, libdrm-devel, libselinux-devel
> %endif
> Prereq:    /sbin/chkconfig /sbin/service
> Prereq:   gtk2 >= 2.6
>@@ -70,6 +75,13 @@ from a wide variety of machine architect
> client which will allow you to connect to other desktops running a VNC
> server.
> 
>+This RPM has been provided by Red Hat for testing purposes only and is
>+NOT supported for any other use. This RPM may contain changes that are
>+necessary for debugging but that are not appropriate for other uses,
>+or that are not compatible with third-party hardware or software. This
>+RPM should NOT be deployed for purposes other than testing and
>+debugging.
>+
> %package server
> Summary: A VNC server.
> Requires: bash >= 2.0, /usr/bin/mcookie, xorg-x11-xauth, xorg-x11-fonts-base
>@@ -81,6 +93,13 @@ The VNC system allows you to access the 
> variety of platforms.  This package is a VNC server, allowing others
> to access the desktop on your machine.
> 
>+This RPM has been provided by Red Hat for testing purposes only and is
>+NOT supported for any other use. This RPM may contain changes that are
>+necessary for debugging but that are not appropriate for other uses,
>+or that are not compatible with third-party hardware or software. This
>+RPM should NOT be deployed for purposes other than testing and
>+debugging.
>+
> %prep
> %setup -q -n vnc-%{vnc_version}-unixsrc -a1
> pushd unix
>@@ -115,6 +134,10 @@ popd
> %patch24 -p1 -b .ipv6
> %patch25 -p1 -b .render-sigfault
> 
>+# Fix for CRM#1825054 - ofourdan
>+%patch26 -p1 -b .mesa-651
>+%patch27 -p1 -b .selinux-awareness
>+
> cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
> 	unix/xc/programs/Xserver/Xvnc.man \
> 	unix/xc/programs/Xserver/vnc/*.{h,cc} \
>@@ -150,6 +173,10 @@ aclocal --force ; automake --add-missing
> 	--enable-xdmcp \
> 	--disable-xevie \
> 	--disable-dri \
>+%ifnarch s390 s390x ppc64
>+        --enable-glx \
>+        --with-mesa-source=%{_datadir}/mesa/source \
>+%endif
> 	--with-int10=stub
> 
> cp -f %{_bindir}/libtool .
>@@ -275,6 +302,9 @@ fi
> %{_libdir}/xorg/modules/extensions/libvnc.so
> 
> %changelog
>+* Fri Jun 6 2008 Olivier Fourdan <ofourdan@redhat com> 4.1.2-9crm1825054.el5
>+- Test build with GLX enabled for CRM#1825054.
>+
> * Mon Jan 15 2007 Adam Tkac <atkac redhat com> 4.1.2-9.el5
> - fixed render sigfaults in 8bpp server mode
>

Actions: View

Attachments on bug 451789: 309609 | 309610 | 309611 | 309612 | 309613 | 309614