The branch, build-baikal has been updated via ca5d397a4a52966d04642a1385cb9463fab26468 (commit) from a65def426ae839123b65b1aa910784831eaa3fe0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goclient.spec | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ebabc03..07eb618 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low + Make package build on Fedora/EPEL versions that do not have the qtbrowserplugin package. + For EPEL-5 builds: replace full path to qmake-qt4 and lrelease. + + Split up package into bin:packages: x2goclient, x2goplugin, + x2goplugin-provider. [ Ricardo Díaz Martín ] * New upstream versino (4.0.1.2): diff --git a/x2goclient.spec b/x2goclient.spec index 8a64a4d..09322d1 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,7 +1,7 @@ Name: x2goclient Version: 4.0.1.2 Release: 0.0x2go1%{?dist} -Summary: Graphical client for use with the X2Go network based computing environment +Summary: X2Go Client application (Qt4) Group: Applications/Communications License: GPLv2+ @@ -10,7 +10,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. BuildRequires: cups-devel BuildRequires: desktop-file-utils -BuildRequires: libssh-devel +BuildRequires: libssh-devel (>= 0.4.7) BuildRequires: libXpm-devel %if 0%{?fedora} BuildRequires: man2html-core @@ -27,8 +27,8 @@ BuildRequires: qt-devel BuildRequires: qtbrowserplugin-static %endif Requires: hicolor-icon-theme -Requires: mozilla-filesystem Requires: nxproxy +Requires: openssh-clients, openssh-server %if 0%{?el5} # For compatibility with EPEL5 @@ -36,10 +36,29 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif %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. +X2Go is a serverbased computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + +X2Go Client is a graphical client (Qt4) for the X2Go system. +You can use it to connect to running sessions and start new sessions. + + +%package -n x2goplugin +Summary: X2Go Client (Qt4) as browser plugin +Requires: mozilla-filesystem +Requires: nxproxy +Requires: openssh-clients, openssh-server + + +%package -n x2goplugin-provider +Summary: Provide X2Go Plugin via Apache webserver +Requires: httpd %prep @@ -59,14 +78,18 @@ sed -i -e 's/include.*qtbrowserplugin.pri)/LIBS += -lqtbrowserplugin/' x2goclien rm -r qtbrowserplugin* %endif + %build export PATH=%{_qt4_bindir}:$PATH make %{?_smp_mflags} + %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +mkdir %{buildroot}%{_sysconfdir}/httpd/conf.d +ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -90,8 +113,11 @@ fi %{_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 +%files -n x2goplugin +%{_libdir}/mozilla/plugins/libx2goplugin.so + + %changelog hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).