commit tigervnc for openSUSE:Factory
Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2015-02-27 11:06:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2015-01-15 15:58:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-02-27 11:06:48.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Feb 24 13:00:22 UTC 2015 - msrb@suse.com
+
+- Fix build against X server 1.17.x.
+ * u_tigervnc-build-with-xserver-1.17.patch
+
+-------------------------------------------------------------------
+Thu Feb 5 13:39:04 UTC 2015 - msrb@suse.com
+
+- Use xserver sources from xorg-x11-server-source.
+- Drop no longer needed patches:
+ * N_xorg-server-xdmcp.patch
+ * n_tigervnc-dont-build-gtf.patch
+
+-------------------------------------------------------------------
Old:
----
N_xorg-server-xdmcp.patch
n_tigervnc-dont-build-gtf.patch
xorg-server-1.16.1.tar.bz2
New:
----
u_tigervnc-build-with-xserver-1.17.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.iHXHx0/_old 2015-02-27 11:06:49.000000000 +0100
+++ /var/tmp/diff_new_pack.iHXHx0/_new 2015-02-27 11:06:49.000000000 +0100
@@ -36,6 +36,7 @@
BuildRequires: libtool
BuildRequires: nasm
BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-source
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xproto)
@@ -91,7 +92,7 @@
License: GPL-2.0 and MIT
Group: System/X11/Servers/XF86_4
Source1: tigervnc-1.4.1.tar.gz
-Source2: xorg-server-1.16.1.tar.bz2
+Source2: index.vnc
Source3: vnc.xinetd
Source4: 10-libvnc.conf
Source5: vnc-server.firewall
@@ -99,9 +100,6 @@
Source7: vnc_inetd_httpd
Source8: vnc.reg
Source9: vncpasswd.arg
-Source10: index.vnc
-
-# Tiger vnc patches
Patch1: tigervnc-newfbsize.patch
Patch2: tigervnc-clean-pressed-key-on-exit.patch
Patch3: tigervnc-sf3495623.patch
@@ -111,10 +109,7 @@
Patch7: U_include-vencrypt-only-if-any-subtype-present.patch
Patch8: u_tigervnc-use_preferred_mode.patch
Patch9: u_tigervnc-cve-2014-8240.patch
-
-# Xserver patches
-Patch20: N_xorg-server-xdmcp.patch
-Patch21: n_tigervnc-dont-build-gtf.patch
+Patch10: u_tigervnc-build-with-xserver-1.17.patch
%description
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
@@ -133,13 +128,8 @@
This is the TigerVNC implementation of Xvnc.
%prep
-%setup -T -b1 -b2
-cp -r ../xorg-server-*/* unix/xserver/
-
-if [ -e unix/xserver/hw/xfree86/modes/xf86gtf.c -o -e unix/xserver/hw/xfree86/utils/gtf/gtf.c ]; then
- echo "Files hw/xfree86/modes/xf86gtf hw/xfree86/utils/gtf/gtf.c have to be excluded from the xserver source tar ball (bnc#85566)."
- exit 1
-fi
+%setup -T -b1
+cp -r /usr/src/xserver/* unix/xserver/
%patch1 -p1
%patch2 -p1
@@ -150,11 +140,10 @@
%patch7 -p0
%patch8 -p0
%patch9 -p1
+%patch10 -p1
pushd unix/xserver
patch -p1 < ../xserver116.patch
-%patch20 -p1
-%patch21 -p1
popd
%build
@@ -207,6 +196,7 @@
install -m755 VncViewer.jar $RPM_BUILD_ROOT%{_datadir}/vnc/classes
popd
+install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/vnc/classes
install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc
%ifnarch s390x
install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf
@@ -216,7 +206,6 @@
install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg
-install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes
%if 0%{?suse_version} >= 1315
ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer
ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vncviewer.1.gz
++++++ u_tigervnc-build-with-xserver-1.17.patch ++++++
Author: Michal Srb
participants (1)
-
root@hilbert.suse.de