SPECS: nxcompext.spec - builds against xorg - patched to use compl...

[aredridel]

Author: aredridel                    Date: Fri Sep  8 23:11:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds against xorg
- patched to use complete include paths

---- Files affected:
SPECS:
   nxcompext.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/nxcompext.spec
diff -u SPECS/nxcompext.spec:1.5 SPECS/nxcompext.spec:1.6
--- SPECS/nxcompext.spec:1.5	Wed Sep  6 19:34:30 2006
+++ SPECS/nxcompext.spec	Sat Sep  9 01:11:45 2006
@@ -12,12 +12,13 @@
 Source0:	http://64.34.161.181/download/%{_version_major}/sources/%{name}-%{_version_major}-%{_version_minor}.tar.gz
 # Source0-md5:	d6738f330687d6c986600a9685e527cf
 Patch0:		%{name}-xgetioerror.patch
+Patch1:	%{name}-xorg-includes.patch
 URL:		http://www.nomachine.com/
-BuildRequires:	X11-devel
-BuildRequires:	X11-Xserver-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-xserver-server-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	nxcomp-devel
+BuildRequires:	nxcomp-devel >= 2.0.0
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,12 +55,13 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
 %configure
-sed -i -e 's#-I/usr/X11R6/include#-I/usr/X11R6/include -I/usr/X11R6/include/X11 -I/usr/X11R6/include/X11/Xserver/programs/Xserver/include#g' Makefile
-sed -i -e 's#-L../nxcomp#-L/usr/X11R6/lib#' Makefile
+sed -i -e 's#-I/usr/X11R6/include#-I/usr/include/X11 -I/usr/include/xorg#g' Makefile
+sed -i -e 's#-L../nxcomp##' Makefile
 %{__make}
 
 %install
@@ -96,6 +98,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/09/08 23:11:45  aredridel
+- builds against xorg
+- patched to use complete include paths
+
 Revision 1.5  2006/09/06 17:34:30  kosmo
 - updated to 2.0.0-33
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nxcompext.spec?r1=1.5&r2=1.6&f=u