This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 656b01c Continue development new b9c1b34 x2goserver.spec: RPMify x2goserver-xsession description. new 7ad5154 x2goserver.spec: remove qt4 stuff, we're not using the framework here. new 98600ee x2goserver.spec: split out logcheck files into an x2goserver-logcheck subpackage. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 ++++++++- x2goserver.spec | 62 ++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 21 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 7ad5154166f0b8684b8a594e46f2f631f977a11b Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 02:30:57 2017 +0100 x2goserver.spec: remove qt4 stuff, we're not using the framework here. --- debian/changelog | 1 + x2goserver.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5971468..4ccfcb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.0.1.23): * x2goserver.spec: - RPMify x2goserver-xsession description. + - Remove qt4 stuff, we're not using the framework here. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index aa4cdad..ec0a9dc 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -391,7 +391,6 @@ sed -i -e 's/\t$(MAKE) -C x2goserver-pyhoca/#\t$(MAKE) -C x2goserver-pyhoca/g' M sed -i -e 's/-o root -g root//' */Makefile %build -export PATH=%{_qt4_bindir}:$PATH make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit b9c1b346ba5b22d517696d4b5a0eb091f229e722 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 02:30:13 2017 +0100 x2goserver.spec: RPMify x2goserver-xsession description. --- debian/changelog | 5 ++++- x2goserver.spec | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 994b393..5971468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (4.0.1.23): + * x2goserver.spec: + - RPMify x2goserver-xsession description. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index f373f5e..aa4cdad 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -316,21 +316,21 @@ Requires: perl = %{perl_version} Requires: perl(Cwd) %description xsession - X2Go is a server based computing environment with +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. + +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 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 98600ee7be9a1809e57ce2f6abdddff296419cda Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 02:32:19 2017 +0100 x2goserver.spec: split out logcheck files into an x2goserver-logcheck subpackage. Avoids installing logcheck as a hard-dependency with X2Go Server for people who do not want or expect that. Logcheck users can install x2goserver-logcheck as a standalone package instead. --- debian/changelog | 4 ++++ x2goserver.spec | 43 +++++++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ccfcb2..ed5bf40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. + - Split out logcheck files into an x2goserver-logcheck subpackage. Avoids + installing logcheck as a hard-dependency with X2Go Server for people who + do not want or expect that. Logcheck users can install + x2goserver-logcheck as a standalone package instead. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index ec0a9dc..9d08cd3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -122,9 +122,6 @@ Requires: pwgen Requires: sshfs # For /etc/sudoers.d Requires: sudo -%if 0%{?fedora} > 19 || 0%{?el5} || 0%{?el6} || 0%{?el7} -Requires: logcheck -%endif Requires: x2goagent >= 3.5.0.33 Requires(post): grep Requires: grep @@ -379,6 +376,26 @@ corresponding desktop shell: - under MATE by x2gomatebindings +%package logcheck +Summary: X2Go Server (logcheck configuration) +Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 19 || 0%{?el5} || 0%{?el6} || 0%{?el7} +Requires: logcheck +%endif + +%description logcheck +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 logcheck configuration files that avoid +false-positives when running X2Go sessions. + + %prep %setup -q @@ -614,16 +631,9 @@ fi %doc x2goserver/doc/README.sudoers %doc x2goserver/etc/sudoers.d/x2goserver %endif -# logcheck is not available on OpenSUSE, SLES/SLED, FC19 and RHEL. -# Please re-check this periodically. -%if 0%{?suse_version} || 0%{?fedora} < 20 || 0%{?rhel} -%dir %{_sysconfdir}/logcheck -%dir %{_sysconfdir}/logcheck/ignore.d.server -%endif %if 0%{?suse_version} %config(noreplace) %{_sysconfdir}/permissions.d/%name %endif -%config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver %if 0%{?suse_version} >= 1210 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %endif @@ -730,4 +740,17 @@ fi %{_datadir}/x2go/versions/VERSION.x2goserver-xsession +%files logcheck +%defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog +# logcheck is not available on OpenSUSE, SLES/SLED, FC19 and RHEL. +# Please re-check this periodically. +%if 0%{?suse_version} || 0%{?fedora} < 20 || 0%{?rhel} +%dir %{_sysconfdir}/logcheck +%dir %{_sysconfdir}/logcheck/ignore.d.server +%endif +%config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver + + %changelog -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git