From 107f75e6fd6ab1fab47651749f7a2d888e1d3f90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:28:19 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index 37d6366..d1caa3f 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Client application License: GPLv2+ @@ -126,6 +126,9 @@ fi %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 14 2023 Orion Poplawski - 4.1.2.3-1 - Update to 4.1.2.3 From 088f2d6a86845a19508838a835bc6f1000beb63f Mon Sep 17 00:00:00 2001 From: AsciiWolf Date: Tue, 25 Jul 2023 15:54:24 +0200 Subject: [PATCH 02/13] Add AppStream metadata --- org.x2go.X2GoClient.metainfo.xml | 27 +++++++++++++++++++++++++++ x2goclient.spec | 12 +++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 org.x2go.X2GoClient.metainfo.xml diff --git a/org.x2go.X2GoClient.metainfo.xml b/org.x2go.X2GoClient.metainfo.xml new file mode 100644 index 0000000..a683325 --- /dev/null +++ b/org.x2go.X2GoClient.metainfo.xml @@ -0,0 +1,27 @@ + + + org.x2go.X2GoClient + CC0-1.0 + GPL-2.0 + + X2Go Client + Graphical client for the X2Go system + +

+ X2Go Client is a graphical client (Qt5) for the X2Go system. You can use it to connect to running sessions and start new sessions. +

+ + + x2goclient.desktop + + + + https://wiki.x2go.org/lib/exe/fetch.php/x2go1.jpg + + + + https://wiki.x2go.org + https://bugs.x2go.org + + + diff --git a/x2goclient.spec b/x2goclient.spec index d1caa3f..fb6ffee 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,11 +1,12 @@ Name: x2goclient Version: 4.1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Client application License: GPLv2+ URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +Source1: org.x2go.X2GoClient.metainfo.xml # Drop clumsy attempt at Kerberos delegation # http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=731 Patch0: x2goclient-krb5.patch @@ -24,6 +25,7 @@ BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cups-devel BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib BuildRequires: libssh-devel BuildRequires: libXpm-devel %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -90,6 +92,10 @@ export PATH=%{_qt4_bindir}:$PATH %make_install PREFIX=%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +install -D -p -m644 %{SOURCE1} %{buildroot}%{_metainfodir}/org.x2go.X2GoClient.metainfo.xml +appstream-util validate-relax \ + --nonet %{buildroot}%{_metainfodir}/org.x2go.X2GoClient.metainfo.xml + mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d @@ -123,9 +129,13 @@ fi %{_datadir}/mime/packages/x-x2go.xml %{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1.gz +%{_metainfodir}/org.x2go.X2GoClient.metainfo.xml %changelog +* Tue Jul 25 2023 Daniel Rusek - 4.1.2.3-3 +- Add AppStream metadata + * Sat Jul 22 2023 Fedora Release Engineering - 4.1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 85141543d3c141cde0d967556b1601605cfb522a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:16:22 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index fb6ffee..59593f1 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Client application License: GPLv2+ @@ -133,6 +133,9 @@ fi %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jul 25 2023 Daniel Rusek - 4.1.2.3-3 - Add AppStream metadata From 895378c183efb8fd47d30c8bc326d1d3da951585 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 25 Jun 2024 22:24:45 -0600 Subject: [PATCH 04/13] Remove MAKEOVERRIDES from Makefile (FTBFS bz#2261794) --- x2goclient.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index 59593f1..9e4c1aa 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Client application License: GPLv2+ @@ -73,6 +73,7 @@ You can use it to connect to running sessions and start new sessions. # Fix up install issues sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile +sed -i -e '/^MAKEOVERRIDES *=/d' Makefile %if 0%{?fedora} || 0%{?rhel} >= 8 sed -i -e 's/qt4/qt5/' Makefile %endif @@ -133,6 +134,9 @@ fi %changelog +* Wed Jun 26 2024 Orion Poplawski - 4.1.2.3-5 +- Remove MAKEOVERRIDES from Makefile (FTBFS bz#2261794) + * Sat Jan 27 2024 Fedora Release Engineering - 4.1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 09891bb6227d90d6825c147d2a22e57eb4916bad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:39:06 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index 9e4c1aa..2054121 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go Client application License: GPLv2+ @@ -134,6 +134,9 @@ fi %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.1.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 26 2024 Orion Poplawski - 4.1.2.3-5 - Remove MAKEOVERRIDES from Makefile (FTBFS bz#2261794) From 033f9a1ac292a5375d0ed0562979c247ac80743d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 04:01:55 +0200 Subject: [PATCH 06/13] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- x2goclient.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x2goclient.spec b/x2goclient.spec index 2054121..3cdbfe8 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,9 +1,10 @@ Name: x2goclient Version: 4.1.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: X2Go Client application -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz Source1: org.x2go.X2GoClient.metainfo.xml @@ -134,6 +135,9 @@ fi %changelog +* Fri Jul 26 2024 Miroslav Suchý - 4.1.2.3-7 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.1.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 024878e363585bd5c974833ed1d408b43950f60b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:21:40 +0000 Subject: [PATCH 07/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index 3cdbfe8..ffc5f89 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: X2Go Client application # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -135,6 +135,9 @@ fi %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.1.2.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 4.1.2.3-7 - convert license to SPDX From cf2ec05dd35c7c9a54acd628af07dfd4dc3e089a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:35:43 +0000 Subject: [PATCH 08/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index ffc5f89..ed706f5 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: X2Go Client application # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -135,6 +135,9 @@ fi %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.1.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.1.2.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dfaddc2b99dec0fe6ecbf1cc4ac026dc2377a118 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:25:20 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index ed706f5..ab2646e 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: X2Go Client application # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -135,6 +135,9 @@ fi %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.1.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 4.1.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 453a069484e3f7dc41c585e728cba7543cae66ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:58:52 +0000 Subject: [PATCH 10/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- x2goclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goclient.spec b/x2goclient.spec index ab2646e..6187742 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: X2Go Client application # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -135,6 +135,9 @@ fi %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.1.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 4.1.2.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 836ce83017c9928383325a195c5ddd77c7921d74 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 17 Jul 2026 22:07:46 -0600 Subject: [PATCH 11/13] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 224 +++++++++++++++++++++++++++++++++++++++++++++++ x2goclient.spec | 227 +----------------------------------------------- 2 files changed, 226 insertions(+), 225 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..b102a6d --- /dev/null +++ b/changelog @@ -0,0 +1,224 @@ +* Fri Jul 17 2026 Fedora Release Engineering - 4.1.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 4.1.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 4.1.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 4.1.2.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 4.1.2.3-7 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 4.1.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 26 2024 Orion Poplawski - 4.1.2.3-5 +- Remove MAKEOVERRIDES from Makefile (FTBFS bz#2261794) + +* Sat Jan 27 2024 Fedora Release Engineering - 4.1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jul 25 2023 Daniel Rusek - 4.1.2.3-3 +- Add AppStream metadata + +* Sat Jul 22 2023 Fedora Release Engineering - 4.1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 14 2023 Orion Poplawski - 4.1.2.3-1 +- Update to 4.1.2.3 + +* Sat Jan 21 2023 Fedora Release Engineering - 4.1.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 4.1.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 4.1.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 4.1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 4.1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 4.1.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Apr 17 2020 Orion Poplawski - 4.1.2.2-2 +- Select X11 backend on wayland for created desktop files (bz#1820989) + +* Fri Feb 14 2020 Orion Poplawski - 4.1.2.2-1 +- Update to 4.1.2.2 + +* Fri Jan 31 2020 Fedora Release Engineering - 4.1.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Dec 13 2019 Orion Poplawski - 4.1.2.1-5 +- Select X11 backend on wayland (bz#1756430) + +* Fri Aug 16 2019 Orion Poplawski - 4.1.2.1-4 +- Add patch to support newer libssh +- Build with Qt5 on RHEL8 + +* Sat Jul 27 2019 Fedora Release Engineering - 4.1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 4.1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 19 2018 Orion Poplawski - 4.1.2.1-1 +- Update to 4.1.2.1 +- Really build against Qt5 on Fedora +- Drops x2goplugin + +* Sat Jul 14 2018 Fedora Release Engineering - 4.1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Mar 6 2018 Orion Poplawski - 4.1.1.1-1 +- Update to 4.1.1.1 + +* Tue Feb 20 2018 Orion Poplawski - 4.1.1.0-4 +- Add upstream patch to fix hang when connecting to a server with Kerberos auth + (bug #1546908) + +* Fri Feb 09 2018 Fedora Release Engineering - 4.1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Nov 29 2017 Orion Poplawski - 4.1.1.0-2 +- Rebuild for proper libssh +- Make x86_64 only for EL7 (libssh dep) + +* Mon Oct 30 2017 Orion Poplawski - 4.1.1.0-1 +- Update to 4.1.1.0 + +* Wed Sep 20 2017 Orion Poplawski - 4.1.0.1-1 +- Update to 4.1.0.1 + +* Thu Aug 03 2017 Fedora Release Engineering - 4.1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 4.1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Orion Poplawski - 4.1.0.0-1 +- Update to 4.1.0.0 + +* Thu Feb 23 2017 Orion Poplawski - 4.0.5.2-3 +- Add patch to disable clumsy attempt at Kerberos delegation + +* Sat Feb 11 2017 Fedora Release Engineering - 4.0.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Sep 21 2016 Orion Poplawski - 4.0.5.2-1 +- Update to 4.0.5.2 +- Drop upstream qt5 patch + +* Thu Mar 24 2016 Orion Poplawski - 4.0.5.1-1 +- Update to 4.0.5.1 +- Drop shell and pubkey patch applied upstream +- Use original qt5 patch +- Use %%license + +* Wed Mar 23 2016 Orion Poplawski - 4.0.5.0-6 +- Build with Qt5 for F24+ + +* Tue Mar 01 2016 Rex Dieter - 4.0.5.0-5 +- x2goclient no longer built with $RPM_OPT_FLAGS (#1306463) + +* Fri Feb 05 2016 Fedora Release Engineering - 4.0.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Sep 21 2015 Orion Poplawski - 4.0.5.0-3 +- Fix segfault due to typo (bug #1264609) + +* Tue Aug 25 2015 Orion Poplawski - 4.0.5.0-2 +- Use login shells to spawn remote commands (bug #1256799) + +* Thu Jul 30 2015 Orion Poplawski - 4.0.5.0-1 +- Update to 4.0.5.0 + +* Fri Jun 19 2015 Fedora Release Engineering - 4.0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 27 2015 Orion Poplawski - 4.0.4.0-1 +- Update to 4.0.4.0 + +* Sat May 02 2015 Kalev Lember - 4.0.3.2-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Thu Feb 19 2015 Orion Poplawski - 4.0.3.2-1 +- Update to 4.0.3.2 + +* Mon Dec 1 2014 Orion Poplawski - 4.0.3.1-1 +- Update to 4.0.3.1 + +* Thu Oct 23 2014 Orion Poplawski - 4.0.3.0-1 +- Update to 4.0.3.0 + +* Mon Aug 18 2014 Fedora Release Engineering - 4.0.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 14 2014 Orion Poplawski - 4.0.2.1-1 +- Update to 4.0.2.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 4.0.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 10 2014 Orion Poplawski - 4.0.2.0-1 +- Update to 4.0.2.0 + +* Tue Feb 18 2014 Orion Poplawski - 4.0.1.3-4 +- Add patch to fix ssh options (bug #1066744) + +* Wed Jan 29 2014 Orion Poplawski - 4.0.1.3-3 +- Add patch to fix libssh password auth issue (bug #1057871) + +* Wed Jan 22 2014 Orion Poplawski - 4.0.1.3-2 +- Add patch to fix libssh timeout issue (bug #1053923) + +* Wed Jan 22 2014 Orion Poplawski - 4.0.1.3-1 +- Update to 4.0.1.3 +- Drop provider patch applied upstream + +* Tue Dec 17 2013 Orion Poplawski - 4.0.1.2-1 +- Update to 4.0.1.2 +- Update summary and description from upstream +- Split out browser plugin into x2goplugin package +- Add x2goplugin-provider package for apache config + +* Wed Sep 11 2013 Orion Poplawski - 4.0.1.1-1 +- Update to 4.0.1.1 +- Drop patches applied upstream + +* Thu Sep 5 2013 Orion Poplawski - 4.0.1.0-5 +- Build against system qtbrowserplugin + +* Fri Aug 30 2013 Orion Poplawski - 4.0.1.0-4 +- Add BR desktop-file-utils and validate desktop file +- Add gtk-update-icon-cache scriptlets + +* Wed Apr 10 2013 Orion Poplawski - 4.0.1.0-3 +- Add patch to set dpi automatically + +* Thu Mar 28 2013 Orion Poplawski - 4.0.1.0-2 +- Add patch to fix proxy connection issue + +* Mon Mar 25 2013 Orion Poplawski - 4.0.1.0-1 +- Update to 4.0.1.0 + +* Tue Feb 12 2013 Orion Poplawski - 4.0.0.2-1 +- Update to 4.0.0.2 + +* Fri Jan 18 2013 Orion Poplawski - 4.0.0.1-1 +- Update to 4.0.0.1 + +* Wed Dec 12 2012 Orion Poplawski - 3.99.3.1-0.1 +- Update to latest git + +* Tue Dec 11 2012 Orion Poplawski - 3.99.3.0-1 +- Initial Fedora package diff --git a/x2goclient.spec b/x2goclient.spec index 6187742..4d9388f 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.1.2.3 -Release: 11%{?dist} +Release: %autorelease Summary: X2Go Client application # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -135,227 +135,4 @@ fi %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 4.1.2.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 4.1.2.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 4.1.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 4.1.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 4.1.2.3-7 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 4.1.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 26 2024 Orion Poplawski - 4.1.2.3-5 -- Remove MAKEOVERRIDES from Makefile (FTBFS bz#2261794) - -* Sat Jan 27 2024 Fedora Release Engineering - 4.1.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Jul 25 2023 Daniel Rusek - 4.1.2.3-3 -- Add AppStream metadata - -* Sat Jul 22 2023 Fedora Release Engineering - 4.1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jul 14 2023 Orion Poplawski - 4.1.2.3-1 -- Update to 4.1.2.3 - -* Sat Jan 21 2023 Fedora Release Engineering - 4.1.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 4.1.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 4.1.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.1.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 4.1.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 4.1.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Apr 17 2020 Orion Poplawski - 4.1.2.2-2 -- Select X11 backend on wayland for created desktop files (bz#1820989) - -* Fri Feb 14 2020 Orion Poplawski - 4.1.2.2-1 -- Update to 4.1.2.2 - -* Fri Jan 31 2020 Fedora Release Engineering - 4.1.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 13 2019 Orion Poplawski - 4.1.2.1-5 -- Select X11 backend on wayland (bz#1756430) - -* Fri Aug 16 2019 Orion Poplawski - 4.1.2.1-4 -- Add patch to support newer libssh -- Build with Qt5 on RHEL8 - -* Sat Jul 27 2019 Fedora Release Engineering - 4.1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 4.1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 19 2018 Orion Poplawski - 4.1.2.1-1 -- Update to 4.1.2.1 -- Really build against Qt5 on Fedora -- Drops x2goplugin - -* Sat Jul 14 2018 Fedora Release Engineering - 4.1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 6 2018 Orion Poplawski - 4.1.1.1-1 -- Update to 4.1.1.1 - -* Tue Feb 20 2018 Orion Poplawski - 4.1.1.0-4 -- Add upstream patch to fix hang when connecting to a server with Kerberos auth - (bug #1546908) - -* Fri Feb 09 2018 Fedora Release Engineering - 4.1.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Nov 29 2017 Orion Poplawski - 4.1.1.0-2 -- Rebuild for proper libssh -- Make x86_64 only for EL7 (libssh dep) - -* Mon Oct 30 2017 Orion Poplawski - 4.1.1.0-1 -- Update to 4.1.1.0 - -* Wed Sep 20 2017 Orion Poplawski - 4.1.0.1-1 -- Update to 4.1.0.1 - -* Thu Aug 03 2017 Fedora Release Engineering - 4.1.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 23 2017 Orion Poplawski - 4.1.0.0-1 -- Update to 4.1.0.0 - -* Thu Feb 23 2017 Orion Poplawski - 4.0.5.2-3 -- Add patch to disable clumsy attempt at Kerberos delegation - -* Sat Feb 11 2017 Fedora Release Engineering - 4.0.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Sep 21 2016 Orion Poplawski - 4.0.5.2-1 -- Update to 4.0.5.2 -- Drop upstream qt5 patch - -* Thu Mar 24 2016 Orion Poplawski - 4.0.5.1-1 -- Update to 4.0.5.1 -- Drop shell and pubkey patch applied upstream -- Use original qt5 patch -- Use %%license - -* Wed Mar 23 2016 Orion Poplawski - 4.0.5.0-6 -- Build with Qt5 for F24+ - -* Tue Mar 01 2016 Rex Dieter - 4.0.5.0-5 -- x2goclient no longer built with $RPM_OPT_FLAGS (#1306463) - -* Fri Feb 05 2016 Fedora Release Engineering - 4.0.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Sep 21 2015 Orion Poplawski - 4.0.5.0-3 -- Fix segfault due to typo (bug #1264609) - -* Tue Aug 25 2015 Orion Poplawski - 4.0.5.0-2 -- Use login shells to spawn remote commands (bug #1256799) - -* Thu Jul 30 2015 Orion Poplawski - 4.0.5.0-1 -- Update to 4.0.5.0 - -* Fri Jun 19 2015 Fedora Release Engineering - 4.0.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 27 2015 Orion Poplawski - 4.0.4.0-1 -- Update to 4.0.4.0 - -* Sat May 02 2015 Kalev Lember - 4.0.3.2-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Thu Feb 19 2015 Orion Poplawski - 4.0.3.2-1 -- Update to 4.0.3.2 - -* Mon Dec 1 2014 Orion Poplawski - 4.0.3.1-1 -- Update to 4.0.3.1 - -* Thu Oct 23 2014 Orion Poplawski - 4.0.3.0-1 -- Update to 4.0.3.0 - -* Mon Aug 18 2014 Fedora Release Engineering - 4.0.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Jul 14 2014 Orion Poplawski - 4.0.2.1-1 -- Update to 4.0.2.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 4.0.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 10 2014 Orion Poplawski - 4.0.2.0-1 -- Update to 4.0.2.0 - -* Tue Feb 18 2014 Orion Poplawski - 4.0.1.3-4 -- Add patch to fix ssh options (bug #1066744) - -* Wed Jan 29 2014 Orion Poplawski - 4.0.1.3-3 -- Add patch to fix libssh password auth issue (bug #1057871) - -* Wed Jan 22 2014 Orion Poplawski - 4.0.1.3-2 -- Add patch to fix libssh timeout issue (bug #1053923) - -* Wed Jan 22 2014 Orion Poplawski - 4.0.1.3-1 -- Update to 4.0.1.3 -- Drop provider patch applied upstream - -* Tue Dec 17 2013 Orion Poplawski - 4.0.1.2-1 -- Update to 4.0.1.2 -- Update summary and description from upstream -- Split out browser plugin into x2goplugin package -- Add x2goplugin-provider package for apache config - -* Wed Sep 11 2013 Orion Poplawski - 4.0.1.1-1 -- Update to 4.0.1.1 -- Drop patches applied upstream - -* Thu Sep 5 2013 Orion Poplawski - 4.0.1.0-5 -- Build against system qtbrowserplugin - -* Fri Aug 30 2013 Orion Poplawski - 4.0.1.0-4 -- Add BR desktop-file-utils and validate desktop file -- Add gtk-update-icon-cache scriptlets - -* Wed Apr 10 2013 Orion Poplawski - 4.0.1.0-3 -- Add patch to set dpi automatically - -* Thu Mar 28 2013 Orion Poplawski - 4.0.1.0-2 -- Add patch to fix proxy connection issue - -* Mon Mar 25 2013 Orion Poplawski - 4.0.1.0-1 -- Update to 4.0.1.0 - -* Tue Feb 12 2013 Orion Poplawski - 4.0.0.2-1 -- Update to 4.0.0.2 - -* Fri Jan 18 2013 Orion Poplawski - 4.0.0.1-1 -- Update to 4.0.0.1 - -* Wed Dec 12 2012 Orion Poplawski - 3.99.3.1-0.1 -- Update to latest git - -* Tue Dec 11 2012 Orion Poplawski - 3.99.3.0-1 -- Initial Fedora package +%autochangelog From 8bfb60cdde48e9328a50de37233de1047676ebc6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 17 Jul 2026 22:09:48 -0600 Subject: [PATCH 12/13] Drop old conditionals [skip changelog] --- x2goclient.spec | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/x2goclient.spec b/x2goclient.spec index 4d9388f..aaea08d 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -29,20 +29,12 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: libssh-devel BuildRequires: libXpm-devel -%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: man2html-core -%else -BuildRequires: man -%endif BuildRequires: openldap-devel -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: pkgconfig(Qt5) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: qt5-linguist -%else -BuildRequires: qt-devel -%endif Requires: hicolor-icon-theme Requires: nxproxy # For GSSAPI authenticated connections @@ -50,10 +42,6 @@ Requires: openssh-clients # For local folder sharing and printing Requires: openssh-server Obsoletes: x2goplugin < 4.1.2.1 -%if 0%{?rhel} == 7 -# libssh is x86_64 only for EL7 -ExclusiveArch: x86_64 -%endif %description X2Go is a server-based computing environment with @@ -75,18 +63,12 @@ You can use it to connect to running sessions and start new sessions. sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile sed -i -e '/^MAKEOVERRIDES *=/d' Makefile -%if 0%{?fedora} || 0%{?rhel} >= 8 sed -i -e 's/qt4/qt5/' Makefile -%endif sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro %build -%if 0%{?fedora} || 0%{?rhel} >= 8 export PATH=%{_qt5_bindir}:$PATH -%else -export PATH=%{_qt4_bindir}:$PATH -%endif %make_build @@ -101,24 +83,6 @@ appstream-util validate-relax \ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -%if 0%{?rhel} && 0%{?rhel} <= 7 -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -%endif - - %files %license COPYING LICENSE %doc AUTHORS From 9bb10d9911cf844c40e50000f0d57b7b2b51393b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 17 Jul 2026 22:11:06 -0600 Subject: [PATCH 13/13] Drop x86_32 --- x2goclient.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/x2goclient.spec b/x2goclient.spec index aaea08d..28cea80 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -42,6 +42,7 @@ Requires: openssh-clients # For local folder sharing and printing Requires: openssh-server Obsoletes: x2goplugin < 4.1.2.1 +ExcludeArch: %{ix86} %description X2Go is a server-based computing environment with