SPECS: nx.spec - modular xorg deps - builds with gcc4

[aredridel]

Author: aredridel                    Date: Mon Mar 20 00:23:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- modular xorg deps
- builds with gcc4

---- Files affected:
SPECS:
   nx.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.10 SPECS/nx.spec:1.11
--- SPECS/nx.spec:1.10	Thu Jan 26 23:00:26 2006
+++ SPECS/nx.spec	Mon Mar 20 01:23:17 2006
@@ -37,9 +37,13 @@
 Patch0:		%{name}-X11-libs.patch
 Patch1:		%{name}compext-libs.patch
 Patch2:		%{name}viewer.patch
+Patch3:		%{name}-gcc-4.1.patch
 URL:		http://www.nomachine.com/
-BuildRequires:	XFree86-devel
-BuildRequires:	Xaw3d-devel
+BuildRequires:	xorg-cf-files
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-proto-xproto-devel
+#BuildRequires:	Xaw3d-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libjpeg-devel
@@ -48,7 +52,6 @@
 BuildRequires:	openssl-devel
 BuildRequires:	sed >= 4.0
 BuildRequires:	which
-Requires:	XFree86
 Provides:	nx-X11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,6 +69,7 @@
 %patch0
 #%patch1
 %patch2
+%patch3 -p1
 
 %build
 export CFLAGS="%{rpmcflags} -fPIC"
@@ -79,9 +83,10 @@
 
 cd ../nxcompext
 %configure
-sed -i -e "s|LDFLAGS     = |LDFLAGS = -fPIC -L/usr/X11R6/%{_lib}|" Makefile
+sed -i -e "s|LDFLAGS     = |LDFLAGS = -fPIC |" Makefile
 %{__make} \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	MAKEDEPEND=/bin/true
 
 cd ../nx-X11
 %{__make} \
@@ -98,7 +103,9 @@
 %{__make}
 
 cd ../nxviewer
-xmkmf -a
+ln -s ../nx-X11/config config
+ln -s ../nx-X11/exports/ exports
+xmkmf -a .
 %{__make} \
 	EXTRA_LIBRARIES="-L%{_libdir} -L../nx-X11/exports/lib" \
 	CC="%{__cc}" \
@@ -156,6 +163,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/03/20 00:23:17  aredridel
+- modular xorg deps
+- builds with gcc4
+
 Revision 1.10  2006/01/26 22:00:26  glen
 - use sed for inline edits (as perl does not return errors on failures)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.10&r2=1.11&f=u