[x2goclient] Initial import
Orion Poplawski
orion at fedoraproject.org
Fri Sep 6 16:30:26 UTC 2013
commit 0f81684dbb791083d16e0d3df1adb7150e98871b
Author: Orion Poplawski <orion at nwra.com>
Date: Fri Sep 6 10:30:16 2013 -0600
Initial import
.gitignore | 1 +
sources | 1 +
x2goclient-dpi.patch | 39 ++++++++++++++++
x2goclient-proxy.patch | 31 +++++++++++++
x2goclient.spec | 114 ++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 186 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..2d41536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/x2goclient-4.0.1.0.tar.gz
diff --git a/sources b/sources
index e69de29..ad54485 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ff223344915b9def9e9e5a01ae919532 x2goclient-4.0.1.0.tar.gz
diff --git a/x2goclient-dpi.patch b/x2goclient-dpi.patch
new file mode 100644
index 0000000..ffc27aa
--- /dev/null
+++ b/x2goclient-dpi.patch
@@ -0,0 +1,39 @@
+diff --git a/onmainwindow.cpp b/onmainwindow.cpp
+index 31dbc17..5f37cc1 100644
+--- a/onmainwindow.cpp
++++ b/onmainwindow.cpp
+@@ -61,8 +61,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
+ showHaltBtn=false;
+ defaultUseSound=true;
+ defaultSetKbd=true;
+- defaultSetDPI=false;
+- defaultDPI=96;
+ extStarted=false;
+ cmdAutologin=false;
+ defaultLink=2;
+@@ -107,6 +105,16 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
+ cmdAutologin=false;
+
+
++// Try to determine the native DPI and use it for the default
++ int dpix = QApplication::desktop()->physicalDpiX();
++ int dpiy = QApplication::desktop()->physicalDpiY();
++ if ( dpix >0 && dpiy >0) {
++ defaultSetDPI=true;
++ defaultDPI=(dpix+dpiy)/2;
++ } else {
++ defaultSetDPI=false;
++ defaultDPI=96;
++ }
+
+ #ifdef Q_OS_WIN
+ clientSshPort="7022";
+@@ -6661,7 +6669,7 @@ void ONMainWindow::showHelp()
+ "--user=<username>\t\t select user 'username'\n"
+ "--geomerty=<W>x<H>|fullscreen\t set default geometry, default "
+ "value '800x600'\n"
+- "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default not set\n"
++ "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default set to same as local display\n"
+ "--link=<modem|isdn|adsl|wan|lan> set default link type, "
+ "default 'adsl'\n"
+ "--pack=<packmethod>\t\t set default pack method, default "
diff --git a/x2goclient-proxy.patch b/x2goclient-proxy.patch
new file mode 100644
index 0000000..622d2d3
--- /dev/null
+++ b/x2goclient-proxy.patch
@@ -0,0 +1,31 @@
+commit feef5058b44f1dba45c8cd79bb6b687317284f36
+Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
+Date: Thu Mar 28 12:41:00 2013 +0100
+
+ Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution
+
+diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
+index 0db4077..196cec0 100644
+--- a/sshmasterconnection.cpp
++++ b/sshmasterconnection.cpp
+@@ -155,7 +155,7 @@ void SshMasterConnection::slotSshProxyConnectionOk()
+ while ( ONMainWindow::isServerRunning ( localProxyPort ) )
+ ++localProxyPort;
+
+- sshProxy->startTunnel ( host, port, "localhost",localProxyPort,false,this, SLOT ( slotSshProxyTunnelOk(int)),
++ sshProxy->startTunnel ( host, port, "127.0.0.1",localProxyPort,false,this, SLOT ( slotSshProxyTunnelOk(int)),
+ SLOT ( slotSshProxyTunnelFailed(bool,QString,int)));
+
+ }
+@@ -574,11 +574,7 @@ bool SshMasterConnection::sshConnect()
+ QByteArray tmpBA = host.toLocal8Bit();
+ if(useproxy && proxytype==PROXYSSH)
+ {
+-#ifdef Q_OS_WIN
+ ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "127.0.0.1" );
+-#else
+- ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "localhost" );
+-#endif
+ ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &localProxyPort );
+
+ }
diff --git a/x2goclient.spec b/x2goclient.spec
new file mode 100644
index 0000000..8285c8a
--- /dev/null
+++ b/x2goclient.spec
@@ -0,0 +1,114 @@
+Name: x2goclient
+Version: 4.0.1.0
+Release: 5%{?dist}
+Summary: Graphical client for use with the X2Go network based computing environment
+
+Group: Applications/Communications
+License: GPLv2+
+URL: http://www.x2go.org
+Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
+# Upstream patch to fix proxy connection issue
+Patch0: x2goclient-proxy.patch
+# Patch to set dpi automatically
+Patch1: x2goclient-dpi.patch
+
+BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libssh-devel
+BuildRequires: libXpm-devel
+%if 0%{?fedora}
+BuildRequires: man2html-core
+%else
+BuildRequires: man
+%endif
+BuildRequires: openldap-devel
+BuildRequires: qt-devel
+BuildRequires: qtbrowserplugin-static
+Requires: hicolor-icon-theme
+Requires: mozilla-filesystem
+Requires: nxproxy
+
+%description
+This client will be able to connect to X2Go server(s) and start, stop, resume
+and terminate (running) desktop sessions. X2Go Client stores different server
+connections and may automatically request authentication data from LDAP
+directories.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .proxy
+%patch1 -p1 -b .dpi
+# Fix up install issues
+sed -i -e 's/-o root -g root//' Makefile
+sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
+# Use system qtbrowserplugin
+sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro
+sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro
+sed -i -e 's/include.*qtbrowserplugin.pri)/LIBS += -lqtbrowserplugin/' x2goclient.pro
+rm -r qtbrowserplugin*
+
+
+%build
+export PATH=%{_qt4_bindir}:$PATH
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/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
+%doc AUTHORS COPYING LICENSE
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_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}/
+%{_libdir}/mozilla/plugins/libx2goplugin.so
+%{_mandir}/man1/%{name}.1.gz
+
+
+%changelog
+* Thu Sep 5 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.0-5
+- Build against system qtbrowserplugin
+
+* Fri Aug 30 2013 Orion Poplawski <orion at cora.nwra.com> - 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 <orion at cora.nwra.com> - 4.0.1.0-3
+- Add patch to set dpi automatically
+
+* Thu Mar 28 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.0-2
+- Add patch to fix proxy connection issue
+
+* Mon Mar 25 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.0-1
+- Update to 4.0.1.0
+
+* Tue Feb 12 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.0.2-1
+- Update to 4.0.0.2
+
+* Fri Jan 18 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.0.1-1
+- Update to 4.0.0.1
+
+* Wed Dec 12 2012 Orion Poplawski <orion at cora.nwra.com> - 3.99.3.1-0.1
+- Update to latest git
+
+* Tue Dec 11 2012 Orion Poplawski <orion at cora.nwra.com> - 3.99.3.0-1
+- Initial Fedora package
More information about the scm-commits
mailing list