This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 196b2ba debian/changelog: sync with release/4.0.1.x branch. new 3882f68 x2goserver.spec: actually add logcheck Requires. new 60f5db7 x2goserver.spec: RPMify x2goserver-xsession description. new 934312e x2goserver.spec: remove qt4 stuff, we're not using the framework here. new ed91de5 x2goserver.spec: split out logcheck files into an x2goserver-logcheck subpackage. The 4 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 | 11 ++++++++++- x2goserver.spec | 59 ++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 18 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 master in repository x2goserver. commit 3882f683ff0842eecfe2ab7b3b9385e87037398f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 02:15:53 2017 +0100 x2goserver.spec: actually add logcheck Requires. --- debian/changelog | 1 + x2goserver.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7155513..f57d2fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -230,6 +230,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low - Exclude %{_bindir}/x2goagent from being packaged into x2goserver package. - x2goserver-x2goagent needs nxagent 3.5.99.3 and higher. + - Actually add logcheck Requires. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Depend upon newer x2goagent package that now provides the diff --git a/x2goserver.spec b/x2goserver.spec index d8fc9b5..af6e3ae 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -106,6 +106,9 @@ 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-virtual Requires(post): grep Requires: grep -- 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 master in repository x2goserver. commit 60f5db7e44ea1cc72391b7ad940edc0ce40869cc Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 02:30:13 2017 +0100 x2goserver.spec: RPMify x2goserver-xsession description. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 5 ++++- x2goserver.spec | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index f57d2fe..16454b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -249,7 +249,10 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low 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 af6e3ae..41379d8 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -461,21 +461,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 master in repository x2goserver. commit 934312e7676d56d083ff3427bf44399294d117e8 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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 16454b7..2b1ab75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -253,6 +253,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 41379d8..e8cab80 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -534,7 +534,6 @@ sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath 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} NXLIBDIR=%{_libdir}/nx -- 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 master in repository x2goserver. commit ed91de5fe3db2e0493ae48c502126d42eb7141df 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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 4 ++++ x2goserver.spec | 43 +++++++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b1ab75..71cfb62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -254,6 +254,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 e8cab80..092eda4 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -106,9 +106,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-virtual Requires(post): grep Requires: grep @@ -524,6 +521,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 @@ -760,13 +777,6 @@ 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 -%config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver %if 0%{?suse_version} >= 1210 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %endif @@ -941,4 +951,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
-
git-admin＠x2go.org