This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit d3d4413380c8ced1a5464ae5ea95bdd7d7a4602d Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 14 01:04:54 2018 +0100 x2goclient.spec: remove plugin references. --- debian/changelog | 2 ++ x2goclient.spec | 94 ++------------------------------------------------------ 2 files changed, 5 insertions(+), 91 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb2dd99..a15229a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium - src/sshmasterconnection.cpp: stop libssh/OpenSSL from querying for a passphrase if started with a controlling terminal. - x2goclient.pro: remove plugin references. + * x2goclient.spec: + - Remove plugin references. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/x2goclient.spec b/x2goclient.spec index 248720b..98800d2 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -33,10 +33,6 @@ BuildRequires: qt-devel BuildRequires: openldap-devel %endif -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 -BuildRequires: qtbrowserplugin-static -%endif - %if "%{?_vendor}" == "redhat" %if 0%{?fedora} || 0%{?el7} BuildRequires: man2html-core @@ -85,6 +81,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif + %description X2Go is a server-based computing environment with - session resuming @@ -99,57 +96,10 @@ 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 -Group: Applications/Communications -Requires: mozilla-filesystem -Requires: nxproxy -%if 0%{?suse_version} -Requires: openssh -%else -Requires: openssh-clients, openssh-server -%endif - - -%description -n x2goplugin -X2Go is a server-based 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. - -This package provides X2Go Client as QtBrowser-based Mozilla plugin. - - -%package -n x2goplugin-provider -Summary: Provide X2Go Plugin via Apache webserver -Group: Applications/Communications -Requires: httpd - -%description -n x2goplugin-provider -X2Go is a server-based 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 - -This package provides an example configuration for providing -the X2Go Plugin via an Apache webserver. - %prep %setup -q # Fix up install issues sed -i -e 's/-o root -g root//' Makefile -sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' 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 %if 0%{?el5} @@ -160,13 +110,6 @@ sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makef sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_bindir}/qmake@' Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_bindir}/lrelease@' Makefile %endif -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 -# 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 x2gobrowserplugin* || : -%endif %build @@ -179,21 +122,15 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %if 0%{?suse_version} -mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d -ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/apache2/conf.d/x2goplugin-provider.conf -%else -mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf -%endif - -%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 || : + %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null @@ -226,29 +163,4 @@ fi %{_mandir}/man1/%{name}.1.gz -%files -n x2goplugin -%defattr(-,root,root) -%dir %{_libdir}/mozilla -%dir %{_libdir}/mozilla/plugins -%{_libdir}/mozilla/plugins/libx2goplugin.so - -%files -n x2goplugin-provider -%defattr(-,root,root) -# Link -%if 0%{?suse_version} -%dir %{_sysconfdir}/apache2/ -%dir %{_sysconfdir}/apache2/conf.d/ -%{_sysconfdir}/apache2/conf.d/x2goplugin-provider.conf -%else -%dir %{_sysconfdir}/httpd/ -%dir %{_sysconfdir}/httpd/conf.d/ -%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf -%endif -%dir %{_sysconfdir}/x2go -%dir %{_sysconfdir}/x2go/plugin-provider -%config(noreplace) %{_sysconfdir}/x2go/plugin-provider/x2goplugin.html -%config(noreplace) %{_sysconfdir}/x2go/x2goplugin-apache.conf -%{_datadir}/x2go/ - - %changelog -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git