SPECS: vnc.spec - another hack for "xor" and "and" for pixman.h

[glen]

Author: glen                         Date: Tue Jan  8 11:18:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- another hack for "xor" and "and" for pixman.h

---- Files affected:
SPECS:
   vnc.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/vnc.spec
diff -u SPECS/vnc.spec:1.80 SPECS/vnc.spec:1.81
--- SPECS/vnc.spec:1.80	Tue Jan  8 09:53:09 2008
+++ SPECS/vnc.spec	Tue Jan  8 12:18:19 2008
@@ -238,7 +238,8 @@
 %patch102 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
-sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
+# update: we use local pixman.h copy too, see below
+sed -i -e 's#<pixman\.h>#"pixman.h"#g' fb/fb.h include/miscstruct.h render/picture.h
 %endif
 cd ../..
 
@@ -274,13 +275,14 @@
 	unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
 	unix/xc/programs/Xserver/vnc/*.{h,cc} \
-	unix/xorg-server-*/{cfb/cfb.h,fb/fb.h,fb/fbrop.h} \
-	unix/xorg-server-*/hw/vnc/
+	unix/xorg-server/{cfb/cfb.h,fb/fb.h,fb/fbrop.h} \
+	unix/xorg-server/hw/vnc/
+cp /usr/include/pixman-1/pixman.h \
+	unix/xorg-server/include
 
 # symbol clash with vnc code
-# TODO pixman headers have same problem...
 sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
-	unix/xorg-server-*/hw/vnc/{cfb,fb,fbrop}.h
+	unix/xorg-server/{hw/vnc/{cfb,fb,fbrop}.h,include/pixman.h}
 
 %build
 cd unix
@@ -411,6 +413,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2008-01-08 11:18:19  glen
+- another hack for "xor" and "and" for pixman.h
+
 Revision 1.80  2008-01-08 08:53:09  glen
 - BR pixman-devel (from xorg-server spec)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vnc.spec?r1=1.80&r2=1.81&f=u