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