rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

Accepting request 1148477 from X11:XOrg

Browse Source 
- Set the URL at Source0.
- patches have been renamed 
  * u_build_libXvnc_as_separate_library.patch --> 
    u_tigervnc-Build-libXvnc-as-separate-library.patch
 * n_vncserver.patch -->
   n_tigervnc-Vncserver.patch
 * n_correct_path_in_desktop_file.patch -->
   n_tigervnc-Correct-path-in-desktop-file.patch
 * n_tigervnc-date-time.patch -->
   n_tigervnc-Date-time.patch
 * u_change-button-layout-in-ServerDialog.patch -->
   u_tigervnc-Change-button-layout-in-ServerDialog.patch   
 * n_dont_sign_java_client.patch -->
   n_tigervnc-Dont-sign-java-client.patch 
 * u_tigervnc-add-autoaccept-parameter.patch -->
   u_tigervnc-Add-autoaccept-parameter.patch
 * u_tigervnc-ignore-epipe-on-write.patch
   u_tigervnc-Ignore-epipe-on-write.patch
- Cleanup specfile
  * Use the same format for all the patches.
  * Use autosetup to apply all the patches with -p1.
  * Clean number of sources.
- buildrequire xorg-x11-server-source/-sdk >= 21.1.11 and trigger
  rebuild with newer xorg-x11-server-source package (bsc#1219311,
  bsc#1219205)

OBS-URL: https://build.opensuse.org/request/show/1148477
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=101
This commit is contained in:
Ana Guerrero 2024-02-23 15:40:15 +00:00 committed by Git OBS Bridge
commit 115991678a
10 changed files with 99 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
n_correct_path_in_desktop_file.patch → n_tigervnc-Correct-path-in-desktop-file.patch
View File

0
n_tigervnc-date-time.patch → n_tigervnc-Date-time.patch
View File

6
n_dont_sign_java_client.patch → n_tigervnc-Dont-sign-java-client.patch
View File

@ -7,10 +7,10 @@ The signing was necessary for accessing the system clipboard
when the Java client runs as an applet. when the Java client runs as an applet.
(This shouldn't harm due to the deprecation of Java applets (This shouldn't harm due to the deprecation of Java applets
was done in version 9). was done in version 9).
Index: java/CMakeLists.txt Index: tigervnc-1.13.1/java/CMakeLists.txt
=================================================================== ===================================================================
--- java/CMakeLists.txt.orig --- tigervnc-1.13.1.orig/java/CMakeLists.txt
+++ java/CMakeLists.txt +++ tigervnc-1.13.1/java/CMakeLists.txt
@@ -154,15 +154,6 @@ add_custom_command(OUTPUT VncViewer.jar @@ -154,15 +154,6 @@ add_custom_command(OUTPUT VncViewer.jar
com/jcraft/jsch/jce/*.class com/jcraft/jsch/jce/*.class
com/jcraft/jsch/*.class com/jcraft/jsch/*.class

6
n_vncserver.patch → n_tigervnc-Vncserver.patch
View File

@ -1,7 +1,7 @@
Index: unix/vncserver/vncserver.in Index: tigervnc-1.13.1/unix/vncserver/vncserver.in
=================================================================== ===================================================================
--- unix/vncserver/vncserver.in.orig --- tigervnc-1.13.1.orig/unix/vncserver/vncserver.in
+++ unix/vncserver/vncserver.in +++ tigervnc-1.13.1/unix/vncserver/vncserver.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env perl -#!/usr/bin/env perl
+#!/usr/bin/perl +#!/usr/bin/perl

41
tigervnc.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Feb 21 09:15:27 UTC 2024 - Joan Torres <joan.torres@suse.com>
- Set the URL at Source0.
-------------------------------------------------------------------
Tue Feb 20 16:12:44 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- patches have been renamed
* u_build_libXvnc_as_separate_library.patch -->
u_tigervnc-Build-libXvnc-as-separate-library.patch
* n_vncserver.patch -->
n_tigervnc-Vncserver.patch
* n_correct_path_in_desktop_file.patch -->
n_tigervnc-Correct-path-in-desktop-file.patch
* n_tigervnc-date-time.patch -->
n_tigervnc-Date-time.patch
* u_change-button-layout-in-ServerDialog.patch -->
u_tigervnc-Change-button-layout-in-ServerDialog.patch
* n_dont_sign_java_client.patch -->
n_tigervnc-Dont-sign-java-client.patch
* u_tigervnc-add-autoaccept-parameter.patch -->
u_tigervnc-Add-autoaccept-parameter.patch
* u_tigervnc-ignore-epipe-on-write.patch
u_tigervnc-Ignore-epipe-on-write.patch
-------------------------------------------------------------------
Tue Feb 20 10:16:54 UTC 2024 - Joan Torres <joan.torres@suse.com>
- Cleanup specfile
* Use the same format for all the patches.
* Use autosetup to apply all the patches with -p1.
* Clean number of sources.
-------------------------------------------------------------------
Mon Feb 19 12:49:39 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- buildrequire xorg-x11-server-source/-sdk >= 21.1.11 and trigger
rebuild with newer xorg-x11-server-source package (bsc#1219311,
bsc#1219205)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 21 15:10:39 UTC 2023 - Joan Torres <joan.torres@suse.com> Tue Nov 21 15:10:39 UTC 2023 - Joan Torres <joan.torres@suse.com>

104
tigervnc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package tigervnc # spec file for package tigervnc
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -35,32 +35,32 @@ Summary: An implementation of VNC
License: GPL-2.0-only AND MIT License: GPL-2.0-only AND MIT
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
URL: https://tigervnc.org/ URL: https://tigervnc.org/
Source1: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source4: 10-libvnc.conf Source1: 10-libvnc.conf
Source5: vnc-server.susefirewall Source2: vnc-server.susefirewall
Source6: vnc-httpd.susefirewall Source3: vnc-httpd.susefirewall
Source7: vnc.reg Source4: vnc.reg
Source8: vncpasswd.arg Source5: vncpasswd.arg
Source9: vnc.pam Source6: vnc.pam
Source10: with-vnc-key.sh Source7: with-vnc-key.sh
Source11: index.vnc Source8: index.vnc
Source12: x11vnc Source9: x11vnc
Source13: xvnc@.service.in Source10: xvnc@.service.in
Source14: xvnc.socket Source11: xvnc.socket
Source16: xvnc-novnc.socket Source12: xvnc-novnc.socket
Source17: tigervnc.firewalld Source13: tigervnc.firewalld
Source18: tigervnc-https.firewalld Source14: tigervnc-https.firewalld
Source19: xvnc.target Source15: xvnc.target
Source21: xvnc-novnc.service.in Source16: xvnc-novnc.service.in
Source22: vnc.sysusers Source17: vnc.sysusers
Patch1: u_tigervnc-ignore-epipe-on-write.patch Patch1: u_tigervnc-Ignore-epipe-on-write.patch
Patch2: u_build_libXvnc_as_separate_library.patch Patch2: u_tigervnc-Build-libXvnc-as-separate-library.patch
Patch3: u_tigervnc-add-autoaccept-parameter.patch Patch3: u_tigervnc-Add-autoaccept-parameter.patch
Patch4: u_change-button-layout-in-ServerDialog.patch Patch4: u_tigervnc-Change-button-layout-in-ServerDialog.patch
Patch5: n_tigervnc-date-time.patch Patch5: n_tigervnc-Date-time.patch
Patch6: n_correct_path_in_desktop_file.patch Patch6: n_tigervnc-Correct-path-in-desktop-file.patch
Patch7: n_vncserver.patch Patch7: n_tigervnc-Vncserver.patch
Patch8: n_dont_sign_java_client.patch Patch8: n_tigervnc-Dont-sign-java-client.patch
Provides: tightvnc = 1.5.0 Provides: tightvnc = 1.5.0
Obsoletes: tightvnc < 1.5.0 Obsoletes: tightvnc < 1.5.0
Provides: vnc Provides: vnc
@ -74,8 +74,8 @@ BuildRequires: jpackage-utils
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: xorg-x11-server-sdk >= 21.1.0 BuildRequires: xorg-x11-server-sdk >= 21.1.11
BuildRequires: xorg-x11-server-source >= 21.1.0 BuildRequires: xorg-x11-server-source >= 21.1.11
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xproto)
@ -235,15 +235,7 @@ This is a wrapper that looks like x11vnc, but starts x0vncserver instead.
It maps common x11vnc arguments to x0vncserver arguments. It maps common x11vnc arguments to x0vncserver arguments.
%prep %prep
%setup -T -b1 -q -n tigervnc-%{version} %autosetup -p1
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p0
%patch8 -p0
cp -r %{_prefix}/src/xserver/* unix/xserver/ cp -r %{_prefix}/src/xserver/* unix/xserver/
pushd unix/xserver pushd unix/xserver
@ -251,11 +243,11 @@ patch -p1 < ../xserver21.1.1.patch
popd popd
%build %build
%sysusers_generate_pre %{SOURCE22} xorg-x11-Xvnc vnc.conf %sysusers_generate_pre %{SOURCE17} xorg-x11-Xvnc vnc.conf
export CXXFLAGS="%optflags" export CXXFLAGS="%optflags"
export CFLAGS="%optflags" export CFLAGS="%optflags"
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE13} > xvnc@.service sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE10} > xvnc@.service
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE16} > xvnc-novnc.service
# Build all tigervnc # Build all tigervnc
cmake -DCMAKE_VERBOSE_MAKEFILE=ON \ cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
@ -309,25 +301,25 @@ install -m755 VncViewer.jar %{buildroot}%{_datadir}/vnc/classes
popd popd
%ifnarch s390x %ifnarch s390x
install -D -m 644 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/10-libvnc.conf install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/X11/xorg.conf.d/10-libvnc.conf
%endif %endif
%if %{use_firewalld} %if %{use_firewalld}
install -D -m 644 %{SOURCE17} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc.xml install -D -m 644 %{SOURCE13} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc.xml
install -D -m 644 %{SOURCE18} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc-https.xml install -D -m 644 %{SOURCE14} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc-https.xml
%else %else
install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server
install -D -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%endif %endif
# only package as %%doc (boo#1173045) # only package as %%doc (boo#1173045)
cp %{SOURCE7} . cp %{SOURCE4} .
install -D -m 755 %{SOURCE8} %{buildroot}%{_bindir}/vncpasswd.arg install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/vncpasswd.arg
install -D -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/vnc install -D -m 644 %{SOURCE6} %{buildroot}%{_pam_vendordir}/vnc
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir} mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir}
%endif %endif
install -D -m 644 %{SOURCE11} %{buildroot}%{_datadir}/vnc/classes install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes
%if 0%{?suse_version} >= 1315 %if 0%{?suse_version} >= 1315
ln -s -f %{_sysconfdir}/alternatives/vncviewer %{buildroot}%{_bindir}/vncviewer ln -s -f %{_sysconfdir}/alternatives/vncviewer %{buildroot}%{_bindir}/vncviewer
ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz %{buildroot}%{_mandir}/man1/vncviewer.1.gz ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz %{buildroot}%{_mandir}/man1/vncviewer.1.gz
@ -340,17 +332,17 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxvnc-novnc
mkdir -p %{buildroot}%{_sysconfdir}/vnc mkdir -p %{buildroot}%{_sysconfdir}/vnc
mkdir -p %{buildroot}%{_libexecdir}/vnc mkdir -p %{buildroot}%{_libexecdir}/vnc
install -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/vnc install -D -m 755 %{SOURCE7} %{buildroot}%{_libexecdir}/vnc
install -D -m 755 %{SOURCE12} %{buildroot}%{_bindir}/x11vnc install -D -m 755 %{SOURCE9} %{buildroot}%{_bindir}/x11vnc
install -D xvnc@.service -m 0444 %{buildroot}%{_unitdir}/xvnc@.service install -D xvnc@.service -m 0444 %{buildroot}%{_unitdir}/xvnc@.service
install -D %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket install -D %{SOURCE11} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket
install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket install -D %{SOURCE12} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket
install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target install -D %{SOURCE15} -m 0444 %{buildroot}%{_unitdir}/xvnc.target
install -D xvnc-novnc.service -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service install -D xvnc-novnc.service -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service
install -Dm0644 %{SOURCE22} %{buildroot}%{_sysusersdir}/vnc.conf install -Dm0644 %{SOURCE17} %{buildroot}%{_sysusersdir}/vnc.conf
rm -rf %{buildroot}%{_datadir}/doc/tigervnc* rm -rf %{buildroot}%{_datadir}/doc/tigervnc*

0
u_tigervnc-add-autoaccept-parameter.patch → u_tigervnc-Add-autoaccept-parameter.patch
View File

0
u_build_libXvnc_as_separate_library.patch → u_tigervnc-Build-libXvnc-as-separate-library.patch
View File

0
u_change-button-layout-in-ServerDialog.patch → u_tigervnc-Change-button-layout-in-ServerDialog.patch
View File

6
u_tigervnc-ignore-epipe-on-write.patch → u_tigervnc-Ignore-epipe-on-write.patch
View File

@ -5,10 +5,10 @@ References: bnc#864676
If the VNC server closes connection after our last read and before this write, we will report error message about EPIPE. If the VNC server closes connection after our last read and before this write, we will report error message about EPIPE.
This situation is no error, however, we should quit normally same as when we find out that connection was closed during read. This situation is no error, however, we should quit normally same as when we find out that connection was closed during read.
Index: common/rdr/FdOutStream.cxx Index: tigervnc-1.13.1/common/rdr/FdOutStream.cxx
=================================================================== ===================================================================
--- common/rdr/FdOutStream.cxx.orig --- tigervnc-1.13.1.orig/common/rdr/FdOutStream.cxx
+++ common/rdr/FdOutStream.cxx +++ tigervnc-1.13.1/common/rdr/FdOutStream.cxx
@@ -128,8 +128,12 @@ size_t FdOutStream::writeFd(const void* @@ -128,8 +128,12 @@ size_t FdOutStream::writeFd(const void*
#endif #endif
} while (n < 0 && (errno == EINTR)); } while (n < 0 && (errno == EINTR));