- fix xorg 1.10 patch

Changed files:
    tigervnc-110patch.patch -> 1.1
    tigervnc.spec -> 1.29

diff --git a/tigervnc-110patch.patch b/tigervnc-110patch.patch
new file mode 100644 (file)
index 0000000..a41677e
--- /dev/null
+++ b/tigervnc-110patch.patch
@@ -0,0 +1,30 @@
+--- tigervnc/unix/xserver110.patch~    2010-12-08 17:10:47.000000000 +0100
++++ tigervnc/unix/xserver110.patch     2011-03-06 00:46:19.785092000 +0100
+@@ -10,9 +10,9 @@
+  # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
+  m4_ifndef([XORG_MACROS_VERSION],
+ @@ -65,6 +64,7 @@ dnl forcing an entire recompile.x
++ dnl forcing an entire recompile.x
+  AC_CONFIG_HEADERS(include/version-config.h)
+  
+- AC_PROG_CC
+ +AC_PROG_CXX
+  AM_PROG_AS
+  AC_PROG_INSTALL
+@@ -45,13 +45,13 @@
+       AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+       AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+ @@ -2245,6 +2249,7 @@ hw/dmx/input/Makefile
+- hw/dmx/glxProxy/Makefile
+- hw/dmx/Makefile
++ hw/dmx/man/Makefile
+  hw/vfb/Makefile
++ hw/vfb/man/Makefile
+ +hw/vnc/Makefile
+  hw/xnest/Makefile
++ hw/xnest/man/Makefile
+  hw/xwin/Makefile
+- hw/xwin/glx/Makefile
+ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
+ --- xserver/hw/Makefile.am.vnc        2010-12-08 17:09:34.469198303 +0100
+ +++ xserver/hw/Makefile.am    2010-12-08 17:09:46.789193164 +0100

diff --git a/tigervnc.spec b/tigervnc.spec
index 8d71aeebb15f28e614e5ea3ba5f98d1ff9f7c8be..af22e3a660f0a81f6113f651a04a4c360af6b137 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -20,6 +20,7 @@ Patch1:               %{name}-ldnow.patch
 Patch2:                %{name}-rh102434.patch
 Patch5:                %{name}-viewer-reparent.patch
 Patch6:                %{name}-as-needed.patch
+Patch7:                %{name}-110patch.patch
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -168,6 +169,7 @@ pozwalający na zdalny dostęp do pulpitu.
 %patch2 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's|^po/Makefile.in||' configure.ac