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 5e92d1d9515913a0fbf25abf4b76a541d44bd75b Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 25 07:42:11 2015 +0100 x2goserver.spec: add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not available on *SUSE, FC < 20 and RHEL, so for those distros still own the directories. --- debian/changelog | 4 ++++ x2goserver.spec | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f9327a..d35db49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low Based on a patch submitted by Jason Alavaliant. Fixes: #812. - x2goserver/bin/x2gogetapps: do not print spurious newlines. - Change string "X2go" to "X2Go" where appropriate. + - Add sudo and logcheck as BuildRequires and Requires. Don't own + directories that are owned by sudo and logcheck. Logcheck is not + available on *SUSE, FC < 20 and RHEL, so for those distros still own the + directories. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 9d6494a..25c6fcb 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -63,6 +63,12 @@ BuildRequires: xinit BuildRequires: xorg-x11-xinit %endif +# Packages only needed for file system paths. +BuildRequires: sudo +%if 0%{?fedora} > 19 || 0%{?el5} || 0%{?el6} || 0%{?el7} +BuildRequires: logcheck +%endif + %if 0%{?suse_version} Requires: openssh %else @@ -95,6 +101,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 >= 3.5.0.25 Requires(post): grep Requires(post): perl(DBD::SQLite) @@ -469,10 +478,13 @@ fi %defattr(-,root,root) %doc debian/copyright %doc debian/changelog -%if 0%{?suse_version} +# 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 -%dir %{_sysconfdir}/sudoers.d +%endif +%if 0%{?suse_version} %config(noreplace) %{_sysconfdir}/permissions.d/%name %endif %config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git