This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 3594a5328782fc79977b3342d972ec6320525f26 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 15:48:47 2023 +0100 x2gokdriveclient.spec: thin out, mostly adapt to current source, switch between Qt 5 and Qt 6 (although Qt 6 is currently untested and only defined for fake versions of distributions that don't exist yet). --- debian/changelog | 3 + x2gokdriveclient.spec | 162 +++++++++++++++----------------------------------- 2 files changed, 51 insertions(+), 114 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6127ef5..c96fc52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,9 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - LICENSE: rename to COPYING. - LICENSE: copy from X2Go Client and adapt. - AUTHORS: copy from X2Go Client and adapt. + - x2gokdriveclient.spec: thin out, mostly adapt to current source, switch + between Qt 5 and Qt 6 (although Qt 6 is currently untested and only + defined for fake versions of distributions that don't exist yet). * debian/rules: * Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/x2gokdriveclient.spec b/x2gokdriveclient.spec index 5fd4b27..47cc471 100644 --- a/x2gokdriveclient.spec +++ b/x2gokdriveclient.spec @@ -1,53 +1,32 @@ -Name: x2goclient -Version: 4.1.2.3 +Name: x2goclientclient +Version: 0.0.0.1 Release: 0.0x2go1%{?dist} -# Default to Qt 4 for now. -%define qt_version 4 -# FC31+ or EPEL 8. -# Tumbleweed or *SuSE 15.3+. -%if ( "%{?_vendor}" == "redhat" && ( 0%{?fedora} > 31 || 0%{?el8} ) ) || ( "%{?_vendor}" == "suse" && ( 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 ) ) +# Default to Qt 5 for now. %define qt_version 5 +# FC42+ or EPEL 10. +# Post-Tumbleweed or *SuSE 16.1+. +# We currently don't use this, but should keep in mind that we will have to +# switch eventually. +%if ( "%{?_vendor}" == "redhat" && ( 0%{?fedora} > 41 || 0%{?el10} ) ) || ( "%{?_vendor}" == "suse" && ( 0%{?suse_version} > 1600 || 0%{?sle_version} >= 160000 ) ) +%define qt_version 6 %endif -Summary: X2Go Client application (Qt%{qt_version}) +Summary: X2Go KDrive Client application (Qt%{qt_version}) %if 0%{?suse_version} Group: Production/Networking/Remote Desktop -License: GPL-2.0+ +License: GPL-3.0+ %else Group: Applications/Communications -License: GPLv2+ +License: GPLv3+ %endif URL: https://www.x2go.org Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -Source1: x2goclient-rpmlintrc +Source1: x2gokdriveclient-rpmlintrc -BuildRequires: cups-devel -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -buildrequires: openldap2-devel -%else -BuildRequires: openldap-devel -%endif - -%if %{qt_version} == 4 -%if 0%{?suse_version} -BuildRequires: libqt4-devel -%if 0%{?suse_version} >= 1310 -BuildRequires: libqt4-linguist -%endif -%else -%if 0%{?el5} || 0%{?el6} -BuildRequires: qt4-devel -%else -BuildRequires: qt-devel -%endif -%endif -%else %if %{qt_version} == 5 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -60,6 +39,18 @@ BuildRequires: libqt5-linguist %else BuildRequires: qt5-linguist %endif +%else +%if %{qt_version} == 6 +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Svg) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(Qt6Network) +%if 0%{?suse_version} +BuildRequires: libqt6-linguist +%else +BuildRequires: qt6-linguist +%endif %endif %endif @@ -69,8 +60,6 @@ BuildRequires: man2html-core %else BuildRequires: man %endif -BuildRequires: libssh-devel >= 0.5.5-2.1x2go1 -BuildRequires: libXpm-devel, libX11-devel %endif %if 0%{?el5} || 0%{?el6} || 0%{?el7} @@ -85,38 +74,13 @@ BuildRequires: pkg-config # but the GCC spec file is still used, which leads to gcc failing # due to a missing annobin plugin during compilation. # Let's build-depend upon redhat-rpm-config for now manually. +# As far as I found out, this is actually an issue with rich dependencies +# caused by our Debian mock/rpm/dnf setup. BuildRequires: redhat-rpm-config %endif %if "%{?_vendor}" == "suse" -BuildRequires: fdupes update-desktop-files -%if 0%{?suse_version} >= 1130 -BuildRequires: pkgconfig(libssh) >= 0.6.3 -BuildRequires: pkgconfig(x11) pkgconfig(xpm) pkgconfig(xproto) -%endif -%if 0%{?suse_version} && 0%{?suse_version} < 1130 -BuildRequires: libssh-devel >= 0.6.3 -BuildRequires: xorg-x11-libXpm-devel xorg-x11-proto-devel -BuildRequires: xorg-x11-libX11-devel -%endif -%endif - -Requires: hicolor-icon-theme -Requires: nxproxy -%if 0%{?suse_version} -Requires: openssh -%else -Requires: openssh-clients, openssh-server -%endif - -%if "%{?_vendor}" == "suse" -Requires: terminus-font -%endif -%if "%{?_vendor}" == "redhat" -Requires: terminus-fonts -%endif -%if 0%{?suse_version} >= 1100 -Suggests: pinentry-x2go +BuildRequires: fdupes %endif %if 0%{?el5} @@ -137,34 +101,25 @@ X2Go is a server-based computing environment with - audio support - authentication by smartcard and USB stick -X2Go Client is a graphical client (Qt%{qt_version}) for the X2Go system. -You can use it to connect to running sessions and start new sessions. +X2Go KDrive Client is the KDrive graphical backend (Qt%{qt_version}) +for X2Go Client that provides support for running modern desktop +environments like GNOME, KDE Plasma, Cinnamon, etc. in X2Go Sessions. + +The X2Go KDrive graphical backend is not suitable for low bandwidth +WAN connections between X2Go Client and X2Go Server. It is supposed +for X2Go being used on the local area network. %prep %setup -q # Fix up install issues -sed -i -e 's/-o root -g root//' Makefile +#sed -i -e 's/-o root -g root//' Makefile test -f ChangeLog && cp ChangeLog res/txt/changelog || test -f debian/changelog && cp debian/changelog res/txt/changelog || true test -f ChangeLog.gitlog && cp ChangeLog.gitlog res/txt/git-info || true %build %define make_call make %{?_smp_mflags} CXXFLAGS='%{optflags}' QMAKE_OPTS='QMAKE_STRIP=:' QT_VERSION='%{qt_version}' -%if %{qt_version} == 4 -%if 0%{?_qt4_bindir:1} -export 'PATH=%{_qt4_bindir}:'"${PATH}" -%endif -%if 0%{?el5} -%{make_call} QMAKE_BINARY='%{_libdir}/qt4/bin/qmake' LRELEASE_BINARY='%{_libdir}/qt4/bin/lrelease' -%else -%if 0%{?suse_version} -%{make_call} QMAKE_BINARY='%{_bindir}/qmake' LRELEASE_BINARY='%{_bindir}/lrelease' -%else -%{make_call} -%endif -%endif -%else %if %{qt_version} == 5 %if 0%{?_qt5_bindir:1} export 'PATH=%{_qt5_bindir}:'"${PATH}" @@ -172,55 +127,34 @@ export 'PATH=%{_qt5_bindir}:'"${PATH}" %if 0%{?_libqt5_bindir:1} export 'PATH=%{_libqt5_bindir}:'"${PATH}" %endif -%{make_call} +%else +%if %{qt_version} == 6 +%if 0%{?_qt5_bindir:1} +export 'PATH=%{_qt6_bindir}:'"${PATH}" +%endif +%if 0%{?_libqt6_bindir:1} +export 'PATH=%{_libqt6_bindir}:'"${PATH}" +%endif %endif +%{make_call} %endif %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + +# Install man pages. +install -m 0755 man/man1/*.1 %{buildroot}/%{_mandir}/man1/ %if 0%{?suse_version} -%suse_update_desktop_file -r x2goclient Utility WebUtility %fdupes %buildroot %endif -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-mime-database /usr/share/mime &>/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 || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files %defattr(-,root,root) %doc AUTHORS COPYING LICENSE %{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/mime/packages/x-x2go.xml -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/128x128 -%dir %{_datadir}/icons/hicolor/128x128/apps -%dir %{_datadir}/icons/hicolor/16x16 -%dir %{_datadir}/icons/hicolor/16x16/apps -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps -%dir %{_datadir}/icons/hicolor/64x64 -%dir %{_datadir}/icons/hicolor/64x64/apps -%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/icons/hicolor/64x64/apps/%{name}.png -%{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1.gz -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git