The branch, build-main has been updated via 9ea9b72d9d1e5eb3e14240593e86233690b9c98b (commit) from 41876ae4b3b6f8565fd7b240697b3a1d9e6f1354 (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: x2goserver.spec | 404 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 302 insertions(+), 102 deletions(-) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index f0d63e4..59edf21 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,8 +1,9 @@ Name: x2goserver -Version: 4.0.1.9 -Release: 0x2go1%{?dist} +Version: 4.1.0.0 +Release: 0.0x2go1%{?dist} Summary: X2Go Server + Group: Applications/Communications License: GPLv2+ URL: http://www.x2go.org @@ -11,8 +12,12 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. # cd x2goserver # git archive --prefix=x2goserver-4.1.0.0-20130722git65169c9/ 65169c9d65b117802e50631be0bbd719163d969e | gzip > ../x2goserver-4.1.0.0-20130722git65169c9.tar.gz #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz -Source1: x2gocleansessions.service -Source2: x2gocleansessions.init +Source1: x2goserver.service +Source2: x2goserver.init +%if 0%{?el5} +# For compatibility with EPEL5 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%endif BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} @@ -29,10 +34,13 @@ Requires: bc Requires: net-tools Requires: openssh-server Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(File::ReadBackwards) # We need a database -Requires: perl(DBD::SQLite) # For killall in x2gosuspend-session Requires: psmisc +# For x2goshowblocks +Requires: lsof +# For x2godbadmin Requires: pwgen # For printing, file-sharing Requires: sshfs @@ -43,6 +51,10 @@ Requires: x2goagent Requires: xorg-x11-xinit Requires: xorg-x11-fonts-misc Requires(pre): shadow-utils +Requires: x2goserver-extensions +#Recommends: x2goserver-xsession +#Recommands: x2goserver-fmbindings +#Recommends: x2goserver-printing %{?perl_default_filter} @@ -59,15 +71,102 @@ This package contains the main daemon and tools for X2Go server-side session administrations. +%package common +Summary: X2Go Server (common files) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Applications/Communications + +%description common +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains common files needed by the X2Go Server +and the X2Go::Server Perl API. + + +%package -n perl-X2Go-Server +Summary: Perl X2Go::Server package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl-X2Go-Log = %{version}-%{release} +Requires: perl-X2Go-Server-DB = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Libraries + +%description -n perl-X2Go-Server +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Server Perl package. + + +%package -n perl-X2Go-Server-DB +Summary: Perl X2Go::Server::DB package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl-X2Go-Log = %{version}-%{release} +Requires: perl(DBD::SQLite) +Requires: perl(DBD::Pg) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Libraries + +%description -n perl-X2Go-Server-DB +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Server::DB Perl package. + + +%package -n perl-X2Go-Log +Summary: Perl X2Go::Log package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Libraries + +%description -n perl-X2Go-Log +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Log Perl package. + + %package printing -Summary: X2Go server printing support +Summary: X2Go Server (printing support) Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Applications/Communications %description printing -The X2Go server printing package provides client-side printing support for +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +The X2Go Server printing package provides client-side printing support for X2Go. -This package has to be installed on X2Go servers that shall be able to pass +This package has to be installed on X2Go Servers that shall be able to pass X2Go print jobs on to the X2Go client. This package co-operates with the cups-x2go CUPS backend. If CUPS server and @@ -76,6 +175,80 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS server). +%package extensions +Summary: X2Go Server (extension support) +Requires: %{name} = %{version}-%{release} +Group: Applications/Communications + +%description extensions +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +The X2Go Server extension namespace offers contributors +to add script functionality to X2Go. + +Make sure you have this package installed on your server +if you want X2Go clients to be able to access your server +without lack of features. + + +%package xsession +Summary: X2Go Server (Xsession runner) +Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-xinit +Group: Applications/Communications + +%description xsession + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This X2Go Server add-on enables Xsession script handling + when starting desktop sessions with X2Go. + . + Amongst others the parsing of Xsession scripts will + enable desktop-profiles, ssh-agent startups, gpgagent + startups and many more Xsession related features on + X2Go session login automagically. + +%package fmbindings +Summary: X2Go Server (file manager bindings) +Requires: %{name} = %{version}-%{release} +Requires: xdg-utils +Requires: desktop-file-utils +Group: Applications/Communications + +%description fmbindings +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains generic MIME type information +for X2Go's local folder sharing. It can be used with all +freedesktop.org compliant desktop shells. + +However, this package can be superseded by other, more specific +destkop binding components, if installed and being used with the +corresponding desktop shell: + - under LXDE by x2golxdebindings + - under GNOMEv2 by x2gognomebindings + - under KDE4 by plasma-widget-x2go + - under MATE by x2gomatebindings + + %prep %setup -q @@ -85,8 +258,6 @@ find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile -# Perl pure_install -sed -i -e 's/perl install/perl pure_install/' Makefile %build @@ -95,14 +266,13 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} -# Make symbolic link relative -rm %{buildroot}%{_sysconfdir}/x2go/Xresources -ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ +# Make sure the .packlist file is removed from %{perl_vendorarch}... +rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist -# Remove placeholder files -rm %{buildroot}%{_libdir}/x2go/extensions/*.d/.placeholder +# Remove placeholder files (in a way that works on EPEL-5, as well) +find %{buildroot}%{_libdir}/x2go/extensions/ -type f -name ".placeholder" | while read file; do rm -f "$file"; done # x2gouser homedir, state dir mkdir -p %{buildroot}%{_sharedstatedir}/x2go @@ -118,45 +288,70 @@ mkdir -p %{buildroot}%{_unitdir} install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} %else # SysV session cleanup script +%if 0%{?el5} +mkdir -p %{buildroot}%{_initrddir} +install -pm0755 %SOURCE2 %{buildroot}%{_initrddir}/x2goserver +%else mkdir -p %{buildroot}%{_initddir} -install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions +install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver +%endif %endif -%pre + +%pre common getent group x2gouser >/dev/null || groupadd -r x2gouser getent passwd x2gouser >/dev/null || \ useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ -c "x2go" x2gouser exit 0 + %post -# Initialize the session database -[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && - %{_sbindir}/x2godbadmin --createdb || : +# Initialize the session database (first attempt, may fail if perl-X2Go-Server-DB is not yet installed +[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && + %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || : %if 0%{?fedora} -%systemd_post x2gocleansessions.service +%systemd_post x2goserver.service %preun -%systemd_preun x2gocleansessions.service +%systemd_preun x2goserver.service %postun -%systemd_postun x2gocleansessions.service +%systemd_postun x2goserver.service %else -/sbin/chkconfig --add x2gocleansessions +/sbin/chkconfig --add x2goserver +/sbin/service x2goserver condrestart >/dev/null 2>&1 || : %postun if [ "$1" -ge "1" ] ; then - /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : + /sbin/service x2goserver condrestart >/dev/null 2>&1 || : fi %preun if [ "$1" = 0 ]; then - /sbin/service x2gocleansessions stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gocleansessions + /sbin/service x2goserver stop >/dev/null 2>&1 + /sbin/chkconfig --del x2goserver fi %endif + +%post -n perl-X2Go-Server-DB +# Initialize the session database (second attempt, may fail if x2goserver is not yet installed +[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && + %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || : + + +%post fmbindings +/usr/bin/update-mime-database /usr/share/mime &>/dev/null || : +/usr/bin/update-desktop-database &>/dev/null || : + +%postun fmbindings +if [ $1 -eq 0 ] ; then + /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : + /usr/bin/update-desktop-database &>/dev/null || : +fi + %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint getent passwd x2goprint >/dev/null || \ @@ -164,114 +359,119 @@ getent passwd x2goprint >/dev/null || \ -c "x2go" x2goprint exit 0 - %files %doc debian/copyright %doc debian/changelog -%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ -%config(noreplace) %{_sysconfdir}/x2go/x* -%config(noreplace) %{_sysconfdir}/x2go/Xsession.options -%{_sysconfdir}/x2go/Xresources -%{_sysconfdir}/x2go/Xsession -%{_sysconfdir}/x2go/Xsession.d +%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %{_bindir}/x2go* +%exclude %{_bindir}/x2goserver-run-extensions +%exclude %{_bindir}/x2gofm %exclude %{_bindir}/x2goprint %dir %{_libdir}/x2go -%{_libdir}/x2go/extensions -%{_libdir}/x2go/x2gosqlitewrapper.pl -%attr(02755,root,x2gouser) %{_libdir}/x2go/x2gosqlitewrapper %{_libdir}/x2go/x2gochangestatus %{_libdir}/x2go/x2gocreatesession -%{_libdir}/x2go/x2godbwrapper.pm +%{_libdir}/x2go/x2gocreateshadowsession %{_libdir}/x2go/x2gogetagent %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports %{_libdir}/x2go/x2gogetstatus %{_libdir}/x2go/x2goinsertport %{_libdir}/x2go/x2goinsertsession +%{_libdir}/x2go/x2goinsertshadowsession %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel -%{_libdir}/x2go/x2gologlevel.pm %{_libdir}/x2go/x2goresume %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* %{_mandir}/man8/x2go*.8.gz +%exclude %{_mandir}/man8/x2goserver-run-extensions.8.gz +%exclude %{_mandir}/man8/x2gofm.8.gz %exclude %{_mandir}/man8/x2goprint.8.gz -%{_datadir}/x2go/ -%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing -%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%dir %{_datadir}/x2go/x2gofeature.d/ +%{_datadir}/x2go/x2gofeature.d/x2goserver.features +%{_datadir}/x2go/versions/VERSION.x2goserver %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions %if 0%{?fedora} -%{_unitdir}/x2gocleansessions.service +%{_unitdir}/x2goserver.service %else -%{_initddir}/x2gocleansessions +%if 0%{?el5} +%{_initrddir}/x2goserver +%else +%{_initddir}/x2goserver +%endif %endif + +%files -n perl-X2Go-Log +%{perl_vendorlib}/X2Go/Log.pm +%{_mandir}/man3/X2Go::Log.* + + +%files -n perl-X2Go-Server +%{perl_vendorlib}/X2Go/Config.pm +%{perl_vendorlib}/X2Go/Server.pm +%{perl_vendorlib}/X2Go/SupeReNicer.pm +%{perl_vendorlib}/X2Go/Utils.pm +%{_mandir}/man3/X2Go::Config.* +%{_mandir}/man3/X2Go::Server.* +%{_mandir}/man3/X2Go::SupeReNicer.* +%{_mandir}/man3/X2Go::Utils.* + + +%files -n perl-X2Go-Server-DB +%dir %{_libdir}/x2go +%{perl_vendorlib}/X2Go/Server/DB* +%attr(2775,root,x2gouser) %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper +%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl +%{_mandir}/man3/X2Go::Server::DB.* +%{_mandir}/man3/X2Go::Server::DB::* +%dir %{_sysconfdir}/x2go/x2gosql +%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql + + +%files common +%dir %{_sysconfdir}/x2go/ +%config(noreplace) %{_sysconfdir}/x2go/x2go* +%{_mandir}/man5/x2goserver.conf.5.gz +%dir %{_datadir}/x2go/versions +%{_datadir}/x2go/versions/VERSION.x2goserver-common + + +%files extensions +%{_libdir}/x2go/extensions +%{_bindir}/x2goserver-run-extensions +%{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features +%{_datadir}/x2go/versions/VERSION.x2goserver-extensions +%{_mandir}/man8/x2goserver-run-extensions.8.gz + + +%files fmbindings +%{_datadir}/x2go/versions/VERSION.x2goserver-fmbindings +%{_bindir}/x2gofm +%{_datadir}/applications/ +%{_datadir}/mime/ +%{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features +%{_mandir}/man8/x2gofm.8.gz + + %files printing %{_bindir}/x2goprint -%{_mandir}/man8/x2goprint.8.gz %{_datadir}/x2go/versions/VERSION.x2goserver-printing %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint +%{_mandir}/man8/x2goprint.8.gz + + +%files xsession +%{_sysconfdir}/x2go/xinitrc.d +%{_sysconfdir}/x2go/Xclients.d +%{_sysconfdir}/x2go/Xresources +%config(noreplace) %{_sysconfdir}/x2go/Xsession +%{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features +%{_datadir}/x2go/versions/VERSION.x2goserver-xsession %changelog -* Wed Nov 27 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.8-2 -- Use mktemp instead of tempfile -- BR xorg-x11-xinit for Xsession.d link creation -- Add patch to fix keyboard setting (bug #1033876) - -* Sat Nov 23 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.8-1 -- Update to 4.0.1.8 -- Fix x2gocleansessions init script for EL6 (bug #1031150) - -* Tue Oct 22 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-6 -- Fix bug in x2gocleansessions init script, enable by default - -* Wed Sep 11 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-5 -- Add some needed requires - -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-3 -- Mark /var/lib/x2go as a directory -- Add patch to make the following changes: -- Remove Xsession.options -- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d -- Make /etc/x2go/Xsession executable - -* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-2 -- Add SysV init script for EL6 - -* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-1 -- Use 4.0.1.6 release -- Drop patches applied upstream - -* Mon Jul 22 2013 Rok Mandeljc <rok.mandeljc@gmail.com> - 4.1.0.0-0.4.20130722git65169c9 -- Update to latest git -- Use PREFIX=%{_prefix} when building, not just when installing. -- Use pwgen instead of makepasswd, which is not available on Fedora. -- Fixed a missing function import in x2golistsessions. -- Added dependencies for xorg-x11-fonts-misc -- Added system.d script for session cleanup on start. -- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19. - -* Thu May 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.3.20130520gitbd2cfe4 -- Update to latest git -- Split out printing sub-package - -* Wed Jan 23 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.2.20130122git -- Add post script to create session database if needed - -* Tue Jan 22 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.1.20130122git -- Update to 4.1.0.0 git - -* Fri Jan 18 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.0.0-1 -- Update to 4.0.0.0 - -* Tue Dec 11 2012 Orion Poplawski <orion@cora.nwra.com> - 3.1.1.9-1 -- Initial Fedora package hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).