This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from d716e91 x2goserver.spec: add workaround documentation for sudoers on *SUSE 11. new dd70d3e x2goserver.spec: add shadow/shadow-utils/pwdutils Requires to x2goserver-printing sub package. new 6eebfb8 x2goserver.spec: move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub package (where they are actually needed.) The 2 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 | 4 ++++ x2goserver.spec | 53 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 17 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.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 dd70d3ed11c745b21283cdca1e495b0a3d13d2a9 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 27 07:50:29 2015 +0100 x2goserver.spec: add shadow/shadow-utils/pwdutils Requires to x2goserver-printing sub package. --- debian/changelog | 2 ++ x2goserver.spec | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0ce2094..5d38f58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -187,6 +187,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - Fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with shadow. Also affects SLE{S,D} 12. - Add workaround documentation for sudoers on *SUSE 11. + - Add shadow/shadow-utils/pwdutils Requires to x2goserver-printing + sub package. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 866af17..6f2bf5a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -301,6 +301,24 @@ Requires: perl = %{perl_version} %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif + +# for useradd/groupadd +# OpenSUSE 12.3 and SLE{S,D} 12 (has suse_version 1315) switched to shadow. +%if 0%{?suse_version} >= 1230 +BuildRequires: shadow +Requires(pre): shadow +%else +# Older SuSE versions (prior to 12.3) only have pwdutils. +%if 0%{?suse_version} +BuildRequires: pwdutils +Requires(pre): pwdutils +# Fedora, EPEL and RedHat use shadow-utils. +%else +BuildRequires: shadow-utils +Requires(pre): shadow-utils +%endif +%endif + %if 0%{?fedora} || 0%{?rhel} Group: Applications/Communications %else -- Alioth's /srv/git/code.x2go.org/x2goserver.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 6eebfb8f54c7b2ad1846f5e66e9b4f0aedb0cbf8 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 27 07:47:28 2015 +0100 x2goserver.spec: move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub package (where they are actually needed.) --- debian/changelog | 2 ++ x2goserver.spec | 35 ++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d38f58..a1de74d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -162,6 +162,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low %{_sbindir} is a macro for /usr/sbin/, whereas chkconfig and service reside in /sbin/. - Change deprecated and removed PreReq to Requires(pre) header. + - Move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub + package (where they are actually needed.) -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 09 May 2014 13:06:24 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index 6f2bf5a..28f6e7d 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -43,23 +43,6 @@ BuildRequires: man BuildRequires: systemd %endif -# for useradd/groupadd -# OpenSUSE 12.3 and SLE{S,D} 12 (has suse_version 1315) switched to shadow. -%if 0%{?suse_version} >= 1230 -BuildRequires: shadow -Requires(pre): shadow -%else -# Older SuSE versions (prior to 12.3) only have pwdutils. -%if 0%{?suse_version} -BuildRequires: pwdutils -Requires(pre): pwdutils -# Fedora, EPEL and RedHat use shadow-utils. -%else -BuildRequires: shadow-utils -Requires(pre): shadow-utils -%endif -%endif - # So XSESSIONDIR gets linked %if 0%{?suse_version} %if 0%{?suse_version} <= 1130 @@ -173,6 +156,24 @@ Requires: perl = %{perl_version} %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif + +# for useradd/groupadd +# OpenSUSE 12.3 and SLE{S,D} 12 (has suse_version 1315) switched to shadow. +%if 0%{?suse_version} >= 1230 +BuildRequires: shadow +Requires(pre): shadow +%else +# Older SuSE versions (prior to 12.3) only have pwdutils. +%if 0%{?suse_version} +BuildRequires: pwdutils +Requires(pre): pwdutils +# Fedora, EPEL and RedHat use shadow-utils. +%else +BuildRequires: shadow-utils +Requires(pre): shadow-utils +%endif +%endif + %if 0%{?fedora} || 0%{?rhel} Group: Applications/Communications %else -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git