rpms/vnc/devel vnc-noxorg.patch, NONE, 1.1 vnc.spec, 1.179, 1.180 vnc-s390.patch, 1.5, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064

Modified Files:
	vnc.spec 
Added Files:
	vnc-noxorg.patch 
Removed Files:
	vnc-s390.patch 
Log Message:
- obsoleted vnc-s390.patch
- build with --disable-xorg


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/devel/vnc.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- vnc.spec	22 Aug 2007 11:49:06 -0000	1.179
+++ vnc.spec	24 Sep 2007 14:44:55 -0000	1.180
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   21%{?dist}
+Release:   22%{?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
@@ -37,6 +36,7 @@
 Patch33:   vnc-always_use_fb.patch
 Patch34:   vnc-vsnprintf.patch
 Patch36:   vnc-24bit.patch
+Patch37:   vnc-noxorg.patch
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -98,9 +98,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
@@ -115,6 +112,7 @@
 %patch33 -p1 -b .always_use_fb
 %patch34 -p1 -b .vsnprintf
 %patch36 -p1 -b .24bit
+%patch37 -p1 -b .nomodule
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -142,7 +140,8 @@
 
 cd xorg-x11-server-source
 aclocal; automake -a; autoconf
-%configure --enable-xorg --disable-xnest --enable-xvfb \
+%configure --disable-xorg \
+	--disable-xnest --enable-xvfb \
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--with-pic \
         --disable-xorgcfg \
@@ -153,7 +152,7 @@
 	--enable-xcsecurity \
 	--with-default-font-path="unix/:7100,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
-        --with-os-name="Fedora Core 7" \
+        --with-os-name="Fedora Core 8" \
         --with-os-vendor="Red Hat, Inc." \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
         --with-rgb-path=%{_datadir}/X11/rgb \
@@ -313,9 +312,13 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 4.1.2-22
+- obsoleted vnc-s390.patch
+- build with --disable-xorg
+
 * Wed Aug 22 2007 Adam Tkac <atkac redhat com> 4.1.2-21
 - rebuild (BuildID feature)
-- GPLv2 livense
+- GPLv2 license
 
 * Mon Aug 06 2007 Adam Tkac <atkac redhat com> 4.1.2-20.2
 - updated vnc-s390 patch to latest xorg


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