fix-clang-build-error.patch

@@ -1,25 +0,0 @@
-From d8479c6d68c571d7080462258f70652573306434 Mon Sep 17 00:00:00 2001
-From: luofeng <luofeng13@huawei.com>
-Date: Mon, 4 Mar 2024 11:08:35 +0800
-Subject: [PATCH] support clang build
-
----
- unix/xserver/mi/miinitext.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unix/xserver/mi/miinitext.c b/unix/xserver/mi/miinitext.c
-index 688beff..6379b17 100644
---- a/unix/xserver/mi/miinitext.c
-+++ b/unix/xserver/mi/miinitext.c
-@@ -108,7 +108,7 @@ SOFTWARE.
- #include "globals.h"
- 
- #ifdef TIGERVNC
--extern void vncExtensionInit(INITARGS);
-+extern void vncExtensionInit();
- #endif
- 
- /* List of built-in (statically linked) extensions */
--- 
-2.19.1
-

tigervnc.spec

@@ -3,14 +3,15 @@
 %global modulename vncsession
 
 Name:           tigervnc
-Version:        1.13.1
+Version:        1.12.0
-Release:        2
+Release:        6
 Summary:        A TigerVNC remote display system
 
 License:        GPLv2+
-URL:            https://tigervnc.org
+URL:            http://github.com/TigerVNC/tigervnc/
 
-Source0:        https://github.com/TigerVNC/tigervnc/archive/v1.13.1.tar.gz
+Source0:        https://github.com/TigerVNC/tigervnc/archive/v1.12.0.tar.gz
+Source1:        vncserver.service
 Source2:        vncserver
 Source3:        10-libvnc.conf
 Source4:        xvnc.service
@@ -19,14 +20,12 @@ Source6:        HOWTO.md
 
 Patch0001:      tigervnc-xserver120.patch
 Patch0002:      0001-Fix-some-translations-of-start-menu.patch
-Patch0003:      fix-clang-build-error.patch
 
-BuildRequires:  make gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3
+BuildRequires:  gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3
 BuildRequires:  libX11-devel libtool libxkbfile-devel libpciaccess-devel libXinerama-devel libXfont2-devel
 BuildRequires:  libXext-devel xorg-x11-server-source libXi-devel libXdmcp-devel libxshmfence-devel
 BuildRequires:  xorg-x11-xtrans-devel xorg-x11-util-macros xorg-x11-server-devel libXtst-devel libdrm-devel libXt-devel
 BuildRequires:  openssl-devel mesa-libGL-devel freetype-devel desktop-file-utils java-devel jpackage-utils pam-devel gnutls-devel libjpeg-turbo-devel selinux-policy-devel
-BuildRequires:  xorg-x11-font-utils libselinux-devel libXdamage-devel libXfixes-devel libXrandr-devel libXrender-devel zlib-devel
 
 Requires(post): coreutils
 Requires(postun):coreutils
@@ -53,7 +52,7 @@ X session.
 %package server-minimal
 Summary:        A minimal installation of TigerVNC server
 
-Requires:       mesa-dri-drivers, xkeyboard-config, %{name}-license xkbcomp dbus-x11
+Requires:       mesa-dri-drivers, xkeyboard-config, %{name}-license xkbcomp
 
 %description server-minimal
 This package provides minimal installation of TigerVNC, with which
@@ -78,7 +77,7 @@ If you want to use web browser in clients, please install this package.
 %package selinux
 Summary:        SElinux module for TigerVNC
 BuildRequires:  selinux-policy-devel
-Requires:       selinux-policy-%{selinuxtype}
+Requires:       selinux-policy-targeted
 BuildArch:      noarch
 
 %description selinux
@@ -105,7 +104,6 @@ for all in `find . -type f -perm -001`; do
 done
 popd
 %patch0002 -p1
-%patch0003 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
@@ -187,14 +185,6 @@ install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.c
 
 install -m 644 %{SOURCE6} %{buildroot}%{_docdir}/tigervnc/HOWTO.md
 
-%check
-pushd tests
-make %{?_smp_mflags}
-./unit/conv
-./unit/convertlf
-./unit/hostport
-./unit/pixelformat
-popd
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -202,7 +192,6 @@ popd
 %{_bindir}/vncviewer
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/metainfo/org.tigervnc.vncviewer.metainfo.xml
 
 %files server
 %defattr(-,root,root)
@@ -249,36 +238,6 @@ popd
 %{_mandir}/man8/*
 
 %changelog
-* Fri Nov 10 2023 luofeng <luofeng13@huawei.com> - 1.13.1-2
-- Type:enhencement
-- CVE:NA
-- SUG:NA
-- DESC: support clang build
-
-* Thu Jul 27 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.13.1-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC:update tigervnc to 1.13.1
-
-* Mon Mar 13 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.13.0-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:add buildrequire xorg-x11-font-utils
-
-* Thu Feb 23 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.13.0-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC:update tigervnc to 1.13.0
-
-* Sat Jun 11 2022 gaihuiying <eaglegai@163.com> - 1.12.0-7
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC: enable test
-
 * Thu Apr 14 2022 ouyangminxiang <ouyangminxiang@kylinsec.com.cn> - 1.12.0-6
 - Type:translation
 - ID:NA

vncserver.service

@@ -0,0 +1,52 @@
+# The vncserver service unit file
+#
+# Quick HowTo:
+# 1. Copy this file to /etc/systemd/system/vncserver@.service
+# 2. Replace <USER> with the actual user name and edit vncserver
+#    parameters appropriately
+# 3. Run `systemctl daemon-reload`
+# 4. Run `systemctl enable vncserver@:<display>.service`
+#
+# DO NOT RUN THIS SERVICE if your local area network is
+# untrusted!  For a secure way of using VNC, you should
+# limit connections to the local host and then tunnel from
+# the machine you want to view VNC on (host A) to the machine
+# whose VNC output you want to view (host B)
+#
+# [user@hostA ~]$ ssh -v -C -L 590N:localhost:590M hostB
+#
+# this will open a connection on port 590N of your hostA to hostB's port 590M
+# (in fact, it ssh-connects to hostB and then connects to localhost (on hostB).
+# See the ssh man page for details on port forwarding)
+#
+# You can then point a VNC client on hostA at vncdisplay N of localhost and with
+# the help of ssh, you end up seeing what hostB makes available on port 590M
+#
+# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
+#
+# Use "-localhost" to prevent remote VNC clients connecting except when
+# doing so through a secure tunnel.  See the "-via" option in the
+# `man vncviewer' manual page.
+
+
+[Unit]
+Description=Remote desktop service (VNC)
+After=syslog.target network.target
+
+[Service]
+Type=forking
+WorkingDirectory=/home/<USER>
+User=<USER>
+Group=<USER>
+
+PIDFile=/home/<USER>/.vnc/%H%i.pid
+
+ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
+ExecStart=/usr/bin/vncserver -autokill %i
+ExecStop=/usr/bin/vncserver -kill %i
+
+Restart=on-success
+RestartSec=15
+
+[Install]
+WantedBy=multi-user.target