rpms/vnc/devel vnc.spec,1.94,1.95

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19188

Modified Files:
	vnc.spec 
Log Message:
* Fri Nov 18 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-21
- Install extension module into the correct directory.



Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vnc.spec	18 Nov 2005 11:56:15 -0000	1.94
+++ vnc.spec	18 Nov 2005 15:55:55 -0000	1.95
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.1
-Release: 20
+Release: 21
 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
@@ -36,6 +36,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: /usr/bin/perl tcp_wrappers
 BuildRequires: zlib-devel libjpeg-devel
+BuildRequires: xorg-x11-server-sdk
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gcc-java
 BuildRequires: autoconf, flex, bison, patchutils
@@ -108,7 +109,7 @@
 cd unix
 bin=%{buildroot}%{_bindir}
 man=%{buildroot}%{_mandir}
-ext=%{buildroot}/usr/X11R6/%{_lib}/modules/extensions
+ext=%{buildroot}$(pkg-config --variable=moduledir xorg-server)
 mkdir -p $bin $man $man/man1 $ext
 ./vncinstall $bin $man $ext
 chmod u+w $bin/* $ext/* || :
@@ -219,9 +220,12 @@
 %{_mandir}/man1/vncconfig.1*
 %{_mandir}/man1/vncserver.1*
 %{_mandir}/man1/x0vncserver.1*
-/usr/X11R6
+%{_libdir}/xorg/modules/*.so
 
 %changelog
+* Fri Nov 18 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-21
+- Install extension module into the correct directory.
+
 * Fri Nov 18 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-20
 - Fix font path correctly (bug #173160).