From 83aaa99c3e30cae3d160979dc8ea70efce352c038f2621cde6e8315749f02404 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 19 Feb 2024 12:55:50 +0000 Subject: [PATCH 1/4] - 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/package/show/X11:XOrg/tigervnc?expand=0&rev=253 --- tigervnc.changes | 7 +++++++ tigervnc.spec | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tigervnc.changes b/tigervnc.changes index 79d63b9..3d8841a 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 19 12:49:39 UTC 2024 - Stefan Dirsch + +- 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 diff --git a/tigervnc.spec b/tigervnc.spec index 8ca0d70..92e05d4 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -74,8 +74,8 @@ BuildRequires: jpackage-utils BuildRequires: libjpeg-devel BuildRequires: libopenssl-devel BuildRequires: libtool -BuildRequires: xorg-x11-server-sdk >= 21.1.0 -BuildRequires: xorg-x11-server-source >= 21.1.0 +BuildRequires: xorg-x11-server-sdk >= 21.1.11 +BuildRequires: xorg-x11-server-source >= 21.1.11 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xproto) From e07c17b201e3762b4261208765e45b5eb737a370b44e5dadf04071e1c1947053 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 20 Feb 2024 16:03:58 +0000 Subject: [PATCH 2/4] Accepting request 1147784 from home:jtorres:branches:X11:XOrg - Cleanup specfile * Use the same format for all the patches. * Use autosetup to apply all the patches with -p1. * Clean number of sources. OBS-URL: https://build.opensuse.org/request/show/1147784 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=254 --- ...igervnc-Correct-path-in-desktop-file.patch | 0 ...e-time.patch => n_tigervnc-Date-time.patch | 0 ... => n_tigervnc-Dont-sign-java-client.patch | 6 +- ...server.patch => n_tigervnc-Vncserver.patch | 6 +- tigervnc.changes | 8 ++ tigervnc.spec | 100 ++++++++---------- ... u_tigervnc-Add-autoaccept-parameter.patch | 0 ...nc-Build-libXvnc-as-separate-library.patch | 0 ...Change-button-layout-in-ServerDialog.patch | 0 ... => u_tigervnc-Ignore-epipe-on-write.patch | 6 +- 10 files changed, 63 insertions(+), 63 deletions(-) rename n_correct_path_in_desktop_file.patch => n_tigervnc-Correct-path-in-desktop-file.patch (100%) rename n_tigervnc-date-time.patch => n_tigervnc-Date-time.patch (100%) rename n_dont_sign_java_client.patch => n_tigervnc-Dont-sign-java-client.patch (89%) rename n_vncserver.patch => n_tigervnc-Vncserver.patch (80%) rename u_tigervnc-add-autoaccept-parameter.patch => u_tigervnc-Add-autoaccept-parameter.patch (100%) rename u_build_libXvnc_as_separate_library.patch => u_tigervnc-Build-libXvnc-as-separate-library.patch (100%) rename u_change-button-layout-in-ServerDialog.patch => u_tigervnc-Change-button-layout-in-ServerDialog.patch (100%) rename u_tigervnc-ignore-epipe-on-write.patch => u_tigervnc-Ignore-epipe-on-write.patch (85%) diff --git a/n_correct_path_in_desktop_file.patch b/n_tigervnc-Correct-path-in-desktop-file.patch similarity index 100% rename from n_correct_path_in_desktop_file.patch rename to n_tigervnc-Correct-path-in-desktop-file.patch diff --git a/n_tigervnc-date-time.patch b/n_tigervnc-Date-time.patch similarity index 100% rename from n_tigervnc-date-time.patch rename to n_tigervnc-Date-time.patch diff --git a/n_dont_sign_java_client.patch b/n_tigervnc-Dont-sign-java-client.patch similarity index 89% rename from n_dont_sign_java_client.patch rename to n_tigervnc-Dont-sign-java-client.patch index 0adbddf..8078138 100644 --- a/n_dont_sign_java_client.patch +++ b/n_tigervnc-Dont-sign-java-client.patch @@ -7,10 +7,10 @@ The signing was necessary for accessing the system clipboard when the Java client runs as an applet. (This shouldn't harm due to the deprecation of Java applets was done in version 9). -Index: java/CMakeLists.txt +Index: tigervnc-1.13.1/java/CMakeLists.txt =================================================================== ---- java/CMakeLists.txt.orig -+++ java/CMakeLists.txt +--- tigervnc-1.13.1.orig/java/CMakeLists.txt ++++ tigervnc-1.13.1/java/CMakeLists.txt @@ -154,15 +154,6 @@ add_custom_command(OUTPUT VncViewer.jar com/jcraft/jsch/jce/*.class com/jcraft/jsch/*.class diff --git a/n_vncserver.patch b/n_tigervnc-Vncserver.patch similarity index 80% rename from n_vncserver.patch rename to n_tigervnc-Vncserver.patch index 2ac642b..183a0da 100644 --- a/n_vncserver.patch +++ b/n_tigervnc-Vncserver.patch @@ -1,7 +1,7 @@ -Index: unix/vncserver/vncserver.in +Index: tigervnc-1.13.1/unix/vncserver/vncserver.in =================================================================== ---- unix/vncserver/vncserver.in.orig -+++ unix/vncserver/vncserver.in +--- tigervnc-1.13.1.orig/unix/vncserver/vncserver.in ++++ tigervnc-1.13.1/unix/vncserver/vncserver.in @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/tigervnc.changes b/tigervnc.changes index 3d8841a..0929bee 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 20 10:16:54 UTC 2024 - Joan Torres + +- 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 diff --git a/tigervnc.spec b/tigervnc.spec index 92e05d4..2ebdd58 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -35,32 +35,32 @@ Summary: An implementation of VNC License: GPL-2.0-only AND MIT Group: System/X11/Servers/XF86_4 URL: https://tigervnc.org/ -Source1: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source4: 10-libvnc.conf -Source5: vnc-server.susefirewall -Source6: vnc-httpd.susefirewall -Source7: vnc.reg -Source8: vncpasswd.arg -Source9: vnc.pam -Source10: with-vnc-key.sh -Source11: index.vnc -Source12: x11vnc -Source13: xvnc@.service.in -Source14: xvnc.socket -Source16: xvnc-novnc.socket -Source17: tigervnc.firewalld -Source18: tigervnc-https.firewalld -Source19: xvnc.target -Source21: xvnc-novnc.service.in -Source22: vnc.sysusers -Patch1: u_tigervnc-ignore-epipe-on-write.patch -Patch2: u_build_libXvnc_as_separate_library.patch -Patch3: u_tigervnc-add-autoaccept-parameter.patch -Patch4: u_change-button-layout-in-ServerDialog.patch -Patch5: n_tigervnc-date-time.patch -Patch6: n_correct_path_in_desktop_file.patch -Patch7: n_vncserver.patch -Patch8: n_dont_sign_java_client.patch +Source0: %{name}-%{version}.tar.gz +Source1: 10-libvnc.conf +Source2: vnc-server.susefirewall +Source3: vnc-httpd.susefirewall +Source4: vnc.reg +Source5: vncpasswd.arg +Source6: vnc.pam +Source7: with-vnc-key.sh +Source8: index.vnc +Source9: x11vnc +Source10: xvnc@.service.in +Source11: xvnc.socket +Source12: xvnc-novnc.socket +Source13: tigervnc.firewalld +Source14: tigervnc-https.firewalld +Source15: xvnc.target +Source16: xvnc-novnc.service.in +Source17: vnc.sysusers +Patch1: u_tigervnc-Ignore-epipe-on-write.patch +Patch2: u_tigervnc-Build-libXvnc-as-separate-library.patch +Patch3: u_tigervnc-Add-autoaccept-parameter.patch +Patch4: u_tigervnc-Change-button-layout-in-ServerDialog.patch +Patch5: n_tigervnc-Date-time.patch +Patch6: n_tigervnc-Correct-path-in-desktop-file.patch +Patch7: n_tigervnc-Vncserver.patch +Patch8: n_tigervnc-Dont-sign-java-client.patch Provides: tightvnc = 1.5.0 Obsoletes: tightvnc < 1.5.0 Provides: vnc @@ -132,7 +132,7 @@ BuildRequires: pkgconfig(xtrans) >= 1.2.2 BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1315 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif %description @@ -235,15 +235,7 @@ This is a wrapper that looks like x11vnc, but starts x0vncserver instead. It maps common x11vnc arguments to x0vncserver arguments. %prep -%setup -T -b1 -q -n tigervnc-%{version} -%patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p0 -%patch8 -p0 +%autosetup -p1 cp -r %{_prefix}/src/xserver/* unix/xserver/ pushd unix/xserver @@ -251,11 +243,11 @@ patch -p1 < ../xserver21.1.1.patch popd %build -%sysusers_generate_pre %{SOURCE22} xorg-x11-Xvnc vnc.conf +%sysusers_generate_pre %{SOURCE17} xorg-x11-Xvnc vnc.conf export CXXFLAGS="%optflags" export CFLAGS="%optflags" -sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE13} > xvnc@.service -sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service +sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE10} > xvnc@.service +sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE16} > xvnc-novnc.service # Build all tigervnc cmake -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ @@ -309,25 +301,25 @@ install -m755 VncViewer.jar %{buildroot}%{_datadir}/vnc/classes popd %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 %if %{use_firewalld} -install -D -m 644 %{SOURCE17} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc.xml -install -D -m 644 %{SOURCE18} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc-https.xml +install -D -m 644 %{SOURCE13} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc.xml +install -D -m 644 %{SOURCE14} %{buildroot}%{_prefix}/lib/firewalld/services/tigervnc-https.xml %else -install -D -m 644 %{SOURCE5} %{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 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server +install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd %endif # only package as %%doc (boo#1173045) -cp %{SOURCE7} . -install -D -m 755 %{SOURCE8} %{buildroot}%{_bindir}/vncpasswd.arg -install -D -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/vnc +cp %{SOURCE4} . +install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/vncpasswd.arg +install -D -m 644 %{SOURCE6} %{buildroot}%{_pam_vendordir}/vnc %if 0%{?suse_version} >= 1550 mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir} %endif -install -D -m 644 %{SOURCE11} %{buildroot}%{_datadir}/vnc/classes +install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes %if 0%{?suse_version} >= 1315 ln -s -f %{_sysconfdir}/alternatives/vncviewer %{buildroot}%{_bindir}/vncviewer 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}%{_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 %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket -install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket -install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target +install -D %{SOURCE11} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket +install -D %{SOURCE12} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket +install -D %{SOURCE15} -m 0444 %{buildroot}%{_unitdir}/xvnc.target 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* diff --git a/u_tigervnc-add-autoaccept-parameter.patch b/u_tigervnc-Add-autoaccept-parameter.patch similarity index 100% rename from u_tigervnc-add-autoaccept-parameter.patch rename to u_tigervnc-Add-autoaccept-parameter.patch diff --git a/u_build_libXvnc_as_separate_library.patch b/u_tigervnc-Build-libXvnc-as-separate-library.patch similarity index 100% rename from u_build_libXvnc_as_separate_library.patch rename to u_tigervnc-Build-libXvnc-as-separate-library.patch diff --git a/u_change-button-layout-in-ServerDialog.patch b/u_tigervnc-Change-button-layout-in-ServerDialog.patch similarity index 100% rename from u_change-button-layout-in-ServerDialog.patch rename to u_tigervnc-Change-button-layout-in-ServerDialog.patch diff --git a/u_tigervnc-ignore-epipe-on-write.patch b/u_tigervnc-Ignore-epipe-on-write.patch similarity index 85% rename from u_tigervnc-ignore-epipe-on-write.patch rename to u_tigervnc-Ignore-epipe-on-write.patch index 19a444d..69dcdbd 100644 --- a/u_tigervnc-ignore-epipe-on-write.patch +++ b/u_tigervnc-Ignore-epipe-on-write.patch @@ -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. 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 -+++ common/rdr/FdOutStream.cxx +--- tigervnc-1.13.1.orig/common/rdr/FdOutStream.cxx ++++ tigervnc-1.13.1/common/rdr/FdOutStream.cxx @@ -128,8 +128,12 @@ size_t FdOutStream::writeFd(const void* #endif } while (n < 0 && (errno == EINTR)); From a8a7ad9c1261f84b57772d5543fdbfcc1c5c3fcee1782ac1f6486dd7817bff77 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 20 Feb 2024 16:19:50 +0000 Subject: [PATCH 3/4] - 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 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=255 --- tigervnc.changes | 21 +++++++++++++++++++++ tigervnc.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tigervnc.changes b/tigervnc.changes index 0929bee..e93832d 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Feb 20 16:12:44 UTC 2024 - Stefan Dirsch + +- 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 diff --git a/tigervnc.spec b/tigervnc.spec index 2ebdd58..4b9d665 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -132,7 +132,7 @@ BuildRequires: pkgconfig(xtrans) >= 1.2.2 BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1315 Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %endif %description From acb5b57cb96b5f5ea6b1d4be90e038a752424d4da8884764a4cf4f5f72e6d3e1 Mon Sep 17 00:00:00 2001 From: Joan Torres Date: Wed, 21 Feb 2024 09:18:02 +0000 Subject: [PATCH 4/4] - Set the URL at Source0. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=256 --- tigervnc.changes | 5 +++++ tigervnc.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tigervnc.changes b/tigervnc.changes index e93832d..04dccbd 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 09:15:27 UTC 2024 - Joan Torres + +- Set the URL at Source0. + ------------------------------------------------------------------- Tue Feb 20 16:12:44 UTC 2024 - Stefan Dirsch diff --git a/tigervnc.spec b/tigervnc.spec index 4b9d665..9320ce1 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -35,7 +35,7 @@ Summary: An implementation of VNC License: GPL-2.0-only AND MIT Group: System/X11/Servers/XF86_4 URL: https://tigervnc.org/ -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: 10-libvnc.conf Source2: vnc-server.susefirewall Source3: vnc-httpd.susefirewall @@ -132,7 +132,7 @@ BuildRequires: pkgconfig(xtrans) >= 1.2.2 BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1315 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif %description