rpms/vnc/F-7 vnc-noxorg.patch, NONE, 1.1 vnc.spec, 1.175, 1.176 vnc-s390.patch, 1.4, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5166

Modified Files:
	vnc.spec 
Added Files:
	vnc-noxorg.patch 
Removed Files:
	vnc-s390.patch 
Log Message:
- build with --disable-xorg (#271141)


vnc-noxorg.patch:

--- NEW FILE vnc-noxorg.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390	2007-09-21 11:11:58.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am	2007-09-21 11:12:46.000000000 +0200
@@ -27,19 +27,8 @@ Xvnc_SOURCES = \
 		$(top_srcdir)/fb/fbcmap.c
 
 Xvnc_LDADD =	$(XORG_CORE_LIBS) \
-		$(XORG_LIBS) \
+		$(XVFB_LIBS) \
 		$(XSERVER_LIBS) \
-		../../fb/libfb.la \
-		../../mi/libminimi.la \
-		../../render/librender.la \
-		../../xkb/libxkbstubs.la \
-		../../dbe/libdbe.la \
-		../../Xext/libXext.la \
-		../../XTrap/libxtrap.la \
-		../../record/librecord.la \
-		../xfree86/os-support/libxorgos.la \
-		../../os/libos.la \
-		../xfree86/common/libcommon.la \
 		-lX11 \
 		libvnccommon.la \
 		../../../../common/rfb/librfb.la


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- vnc.spec	11 Jun 2007 13:36:32 -0000	1.175
+++ vnc.spec	24 Sep 2007 14:56:23 -0000	1.176
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   18%{?dist}
+Release:   18.1.%{?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
@@ -22,7 +22,6 @@
 Patch9:    vnc-vncpasswd.patch
 Patch11:   vnc-modular-xorg.patch
 Patch12:   vnc-nohttpd.patch
-Patch14:   vnc-s390.patch
 Patch15:   vnc-viewer-reparent.patch
 Patch16:   vnc-64bit.patch
 Patch17:   vnc-select.patch
@@ -38,6 +37,7 @@
 Patch34:   vnc-vsnprintf.patch
 Patch35:   vnc-module_crash.patch
 Patch36:   vnc-24bit.patch
+Patch37:   vnc-noxorg.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -99,9 +99,6 @@
 %patch9 -p1 -b .vncpasswd
 %patch11 -p1 -b .modular-xorg
 %patch12 -p1 -b .nohttpd
-pushd unix/xorg-x11-server-source*
-%patch14 -p3 -b .s390
-popd
 %patch15 -p1 -b .viewer-reparent
 %patch16 -p1 -b .64bit
 %patch17 -p1 -b .select
@@ -117,6 +114,7 @@
 %patch34 -p1 -b .vsnprintf
 %patch35 -p1 -b .module_crash
 %patch36 -p1 -b .24bit
+%patch37 -p1 -b .noxorg
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -144,7 +142,7 @@
 
 cd xorg-x11-server-source
 aclocal; automake -a; autoconf
-%configure --enable-xorg --disable-xnest --disable-xvfb \
+%configure --disable-xorg --disable-xnest --disable-xvfb \
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--with-pic \
         --disable-xorgcfg \
@@ -315,6 +313,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 4.1.2-18.1
+- build with --disable-xorg (#271141)
+
 * Mon Jun 11 2007 Adam Tkac <atkac redhat com> 4.1.2-18.fc7
 - Xvnc now has 24bit support (#242277) and correct RENDER initialization
 - updated s390 patch to latest Xorg


--- vnc-s390.patch DELETED ---