From cac416e993a859e80d2185b33025996166e490d2 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Thu, 14 Mar 2013 19:39:26 +0100
Subject: [PATCH] Some bugfixes.

- include /etc/X11/xorg.conf.d/10-libvnc.conf sample configuration (#712482)
- vncserver now honors specified -geometry parameter (#755947)

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 .gitignore     |  1 +
 10-libvnc.conf | 19 +++++++++++++++++++
 sources        |  2 +-
 tigervnc.spec  | 13 +++++++++++--
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 10-libvnc.conf

diff --git a/.gitignore b/.gitignore
index 6c289c3..7e6a52a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tigervnc-1.0.90-20100721svn4113.tar.bz2
 /tigervnc-1.2.80-20121126svn5015.tar.bz2
 /tigervnc-1.2.80-20130219svn5047.tar.bz2
 /tigervnc-1.2.80-20130307svn5060.tar.bz2
+/tigervnc-1.2.80-20130314svn5065.tar.bz2
diff --git a/10-libvnc.conf b/10-libvnc.conf
new file mode 100644
index 0000000..a053a7d
--- /dev/null
+++ b/10-libvnc.conf
@@ -0,0 +1,19 @@
+# This file contains configuration of libvnc.so module
+#
+# To get libvnc.so module working, do this:
+# 1. run "vncpasswd" from tigervnc-server package as root user
+# 2. uncomment configuration lines below
+#
+# Please note you can specify any option which Xvnc accepts.
+# Refer to `Xvnc -help` output for detailed list of options.
+
+#Section "Module"
+#    Load "vnc"
+#EndSection
+
+#Section "Screen"
+#    Identifier "Screen0
+#    DefaultDepth 16
+#    Option "SecurityTypes" "VncAuth"
+#    Option "PasswordFile" "/root/.vnc/passwd"
+#EndSection
diff --git a/sources b/sources
index d9e2835..bfa3e06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c95c824e6d723ce8f2eef0f76af5a326  tigervnc-1.2.80-20130307svn5060.tar.bz2
+4522c6f107dbe778f197b2294c0eb867  tigervnc-1.2.80-20130314svn5065.tar.bz2
diff --git a/tigervnc.spec b/tigervnc.spec
index 76188da..19727d5 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,8 +1,8 @@
-%global		snap 20130307svn5060
+%global		snap 20130314svn5065
 
 Name:		tigervnc
 Version:	1.2.80
-Release:	0.11.%{snap}%{?dist}
+Release:	0.12.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@ URL:		http://www.tigervnc.com
 Source0:	%{name}-%{version}-%{snap}.tar.bz2
 Source1:	vncserver.service
 Source2:	vncserver.sysconfig
+Source3:	10-libvnc.conf
 Source6:	vncviewer.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -236,6 +237,9 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la
 
 %ifarch s390 s390x %{?rhel:ppc ppc64}
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.so
+%else
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
 %endif
 
 %clean
@@ -289,6 +293,7 @@ fi
 %files server-module
 %defattr(-,root,root,-)
 %{_libdir}/xorg/modules/extensions/libvnc.so
+%config %{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
 %endif
 
 %files server-applet
@@ -304,6 +309,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Mar 14 2013 Adam Tkac <atkac redhat com> - 1.2.80-0.12.20130314svn5065
+- include /etc/X11/xorg.conf.d/10-libvnc.conf sample configuration (#712482)
+- vncserver now honors specified -geometry parameter (#755947)
+
 * Tue Mar 12 2013 Adam Tkac <atkac redhat com> - 1.2.80-0.11.20130307svn5060
 - update to r5060
 - split icons to separate package to avoid multilib issues