[tigervnc/f18] Some bugfixes.
Adam Tkac
atkac at fedoraproject.org
Thu Mar 14 18:42:46 UTC 2013
commit 3ca3730fc4daf46fda70e22d17bca1f71939e910
Author: Adam Tkac <atkac at redhat.com>
Date: Thu Mar 14 19:39:26 2013 +0100
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 at redhat.com>
Conflicts:
tigervnc.spec
.gitignore | 1 +
10-libvnc.conf | 19 +++++++++++++++++++
sources | 2 +-
tigervnc.spec | 13 +++++++++++--
4 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e578daf..0d86109 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/tigervnc-1.2.80-20130124svn5036.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 6ab09c4..be80afb 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.9.%{snap}%{?dist}
+Release: 0.10.%{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.10.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.9.20130307svn5060
- update to r5060
- split icons to separate package to avoid multilib issues
More information about the scm-commits
mailing list