- fix _all_ reserved words in xorg headers

Changed files:
    sed-all.patch -> 1.1
    tigervnc.spec -> 1.62

diff --git a/sed-all.patch b/sed-all.patch
new file mode 100644 (file)
index 0000000..79e48f7
--- /dev/null
+++ b/sed-all.patch
@@ -0,0 +1,24 @@
+--- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am~    2011-10-31 09:14:40.000000000 +0100
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am     2012-04-19 08:15:51.849379891 +0200
+@@ -63,7 +63,7 @@
+ BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
+ 
+ fb.h: $(top_srcdir)/fb/fb.h
+-      cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
++      cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
+ 
+ pixman.h:
+       for i in ${XSERVERLIBS_CFLAGS}; do \
+@@ -72,10 +72,10 @@
+               fi; \
+       done; \
+       if [ ! "$$PIXMANINCDIR" = "" ]; then \
+-              cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h; \
++              cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/g' > $(srcdir)/pixman.h; \
+       else \
+               echo Pixman include directory not set in XSERVERLIBS_CFLAGS \(perhaps Pixman was not found by configure?\); \
+       fi
+ 
+ fbrop.h: $(top_srcdir)/fb/fbrop.h
+-      cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
++      cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h

diff --git a/tigervnc.spec b/tigervnc.spec
index 897a9e67d596e01977dc9f859f3f6765c01e40f9..cfcbab1398776455d062db3e267e0e17dafcc9f1 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -25,6 +25,7 @@ Patch8:               gnutls3.patch
 Patch9:                no-bashizm.patch
 Patch10:       xorg112.patch
 Patch11:       cmake-mandir.patch
+Patch12:       sed-all.patch
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -182,6 +183,7 @@ pozwalający na zdalny dostęp do pulpitu.
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1
+%patch12 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver