From 9a50638b87cf41912c7d398192cc598f0b3e35bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:58:14 +0100 Subject: [PATCH 1/3] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- x11vnc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x11vnc.spec b/x11vnc.spec index dc46b99..8bcfa7f 100644 --- a/x11vnc.spec +++ b/x11vnc.spec @@ -5,7 +5,7 @@ Name: x11vnc Version: 0.9.16^%{gitdate}git%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: VNC server for the current X11 session Summary(ru): VNC-сервер для текущей сессии X11 # COPYING: GPL-2.0-or-later text @@ -75,6 +75,7 @@ BuildRequires: libXfixes-devel BuildRequires: libXinerama-devel BuildRequires: libXrandr-devel BuildRequires: libXtst-devel +BuildRequires: libxcrypt-devel BuildRequires: make BuildRequires: openssl-devel BuildRequires: pkgconf-pkg-config @@ -157,6 +158,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop %{_mandir}/man1/x11vnc.1* %changelog +* Sat Feb 01 2025 Björn Esser - 0.9.16^20230801gita61f364-3 +- Add explicit BR: libxcrypt-devel + * Sat Jan 27 2024 Fedora Release Engineering - 0.9.16^20230801gita61f364-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 496c25523e2c8eef7eec332bc734518beb8df150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 2 May 2025 12:14:41 +0200 Subject: [PATCH 2/3] 0.9.17 bump --- .gitignore | 1 + sources | 2 +- x11vnc.spec | 20 ++++++++------------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 00ef705..d98e282 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /x11vnc-0.9.14-dev.tar.gz /x11vnc-0.9.16.tar.gz /x11vnc-a61f364.tar.gz +/x11vnc-0.9.17.tar.gz diff --git a/sources b/sources index d68f255..03568cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x11vnc-a61f364.tar.gz) = 13ce3456fb42755bb5770ea72145dc0563a30b7e8cc0b6aa3be23b17d2354d372667ac23c5da75d5bba61c1b661e065564b5f82b26ef75411eb817e5c90199fd +SHA512 (x11vnc-0.9.17.tar.gz) = 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8 diff --git a/x11vnc.spec b/x11vnc.spec index 8bcfa7f..c88b662 100644 --- a/x11vnc.spec +++ b/x11vnc.spec @@ -1,11 +1,6 @@ -# A git snapshot -%global commit a61f364e385d98677c04070a994397b287385219 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20230801 - Name: x11vnc -Version: 0.9.16^%{gitdate}git%{shortcommit} -Release: 3%{?dist} +Version: 0.9.17 +Release: 1%{?dist} Summary: VNC server for the current X11 session Summary(ru): VNC-сервер для текущей сессии X11 # COPYING: GPL-2.0-or-later text @@ -53,9 +48,9 @@ Summary(ru): VNC-сервер для текущей сессии X11 # src/nox11.h: MIT-open-group # tkx11vnc: GPL-2.0-or-later License: GPL-2.0-or-later AND GPL-2.0-or-later WITH x11vnc-openssl-exception +SourceLicense: %{license} AND GPL-2.0-or-later WITH Autoconf-exception-2.0 AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND MIT-open-group URL: https://github.com/LibVNC/x11vnc -# URL for releases: %%{url}/archive/%%{version}/%%{name}-%%{version}.tar.gz -Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Enforce system crypto policy # Patch0: x11vnc-0.9.16-Respect-a-system-crypto-policy.patch @@ -116,9 +111,7 @@ a versatile and productive while still easy to use program. в использовании. %prep -%setup -q -n %{name}-%{commit} -%patch -P0 -p1 -%patch -P1 -p1 +%autosetup -p1 -n %{name}-%{version} %build autoreconf -fi @@ -158,6 +151,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop %{_mandir}/man1/x11vnc.1* %changelog +* Fri May 02 2025 Petr Pisar - 0.9.17-1 +- 0.9.17 bump + * Sat Feb 01 2025 Björn Esser - 0.9.16^20230801gita61f364-3 - Add explicit BR: libxcrypt-devel From 7c5f8d6f8221ca4a610918f833b33fb94e9cf721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 2 May 2025 12:33:04 +0200 Subject: [PATCH 3/3] Correct a license of m4/ax_type_socklen_t.m4 --- x11vnc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11vnc.spec b/x11vnc.spec index c88b662..390e6fa 100644 --- a/x11vnc.spec +++ b/x11vnc.spec @@ -14,7 +14,7 @@ Summary(ru): VNC-сервер для текущей сессии X11 # src/xi2_devices.h: GPL-2.0-or-later # src/xkb_bell.h: GPL-2.0-or-later WITH x11vnc-openssl-exception ## Not in any binary package -# m4/ax_type_socklen_t.m4: GPL-2.0-or-later WITH Autoconf-exception-2.0 +# m4/ax_type_socklen_t.m4: GPL-2.0-or-later WITH Autoconf-exception-macro ## Not used at all # misc/blockdpy.c: GPL-2.0-or-later # misc/connect_switch: GPL-2.0-or-later @@ -48,7 +48,7 @@ Summary(ru): VNC-сервер для текущей сессии X11 # src/nox11.h: MIT-open-group # tkx11vnc: GPL-2.0-or-later License: GPL-2.0-or-later AND GPL-2.0-or-later WITH x11vnc-openssl-exception -SourceLicense: %{license} AND GPL-2.0-or-later WITH Autoconf-exception-2.0 AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND MIT-open-group +SourceLicense: %{license} AND GPL-2.0-or-later WITH Autoconf-exception-macro AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND MIT-open-group URL: https://github.com/LibVNC/x11vnc Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Enforce system crypto policy