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 6853ba0 add forgotten file: x2goserver-rpmlintrc... picked from master branch new b298188 x2goserver.spec: fix build of 4.0.1.x release series new dd2b57a Don't hard-code /var/lib/ in $HOME path of to-be-created user "x2gouser". new 51184ee Add to BR: findutils. 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 | 3 +++ x2goserver.spec | 39 +++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) -- Alioth's /srv/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 b2981880c35d1bb8f7c04243541f25f20ce86897 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 28 14:57:18 2014 +0100 x2goserver.spec: fix build of 4.0.1.x release series --- x2goserver.spec | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 45c1103..35e3496 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -338,6 +338,13 @@ getent passwd x2gouser >/dev/null || \ -c "x2go" x2gouser exit 0 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +%if 0%{?fedora} || 0%{?rhel} >= 7 +%systemd_pre x2goserver.service +%else +%service_add_pre x2goserver.service +%endif +%endif %post # Initialize the session database @@ -355,13 +362,14 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi fi +%if 0%{?suse_version} +%set_permissions %{_libdir}/x2go/x2gosqlitewrapper +%endif + %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2goserver.service -%pre -%systemd_pre x2goserver.service - %preun %systemd_preun x2goserver.service @@ -370,9 +378,6 @@ fi %else %service_add_post x2goserver.service -%pre -%service_add_pre x2goserver.service - %preun %service_del_preun x2goserver.service @@ -383,15 +388,6 @@ fi /sbin/chkconfig --add x2goserver /sbin/service x2goserver condrestart >/dev/null 2>&1 || : -%if 0%{?suse_version} -%set_permissions %{_libdir}/x2go/x2gosqlitewrapper - - -%verifyscript -%verify_permissions %{_libdir}/x2go/x2gosqlitewrapper -%endif - - %postun if [ "$1" -ge "1" ] ; then /sbin/service x2goserver condrestart >/dev/null 2>&1 || : @@ -405,6 +401,12 @@ fi %endif +%if 0%{?suse_version} +%verifyscript +%verify_permissions %{_libdir}/x2go/x2gosqlitewrapper +%endif + + %post fmbindings /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : /usr/bin/update-desktop-database &>/dev/null || : @@ -468,9 +470,9 @@ exit 0 %dir %{_datadir}/x2go/ %dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/x2goserver.features +%dir %{_datadir}/x2go/versions/ %{_datadir}/x2go/versions/VERSION.x2goserver -%dir %{_localstatedir} -%attr(0775,root,x2gouser) %dir %{_localstatedir}/x2go/ +%attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/ %ghost %attr(0660,root,x2gouser) %{_localstatedir}/lib/x2go/x2go_sessions %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %{_unitdir}/x2goserver.service -- Alioth's /srv/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 dd2b57afdc5e6d7cbd11e3cba5433365b63d1907 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 28 15:27:50 2014 +0100 Don't hard-code /var/lib/ in $HOME path of to-be-created user "x2gouser". --- debian/changelog | 2 ++ x2goserver.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ed4ba47..f48ecec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + Add to R (diverse): perl(Config::Simple), perl(Switch) and perl(Capture::Tiny). + Add to R (x2goserver): perl(File::BaseDir). + + Don't hard-code /var/lib/ in $HOME path of to-be-created user + "x2gouser". -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index 35e3496..8954dfc 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -334,7 +334,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop %pre getent group x2gouser >/dev/null || groupadd -r x2gouser getent passwd x2gouser >/dev/null || \ - useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ + useradd -r -g x2gouser -d %{_localstatedir}/x2go -s /sbin/nologin \ -c "x2go" x2gouser exit 0 -- Alioth's /srv/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 51184ee92b33890c3de0b60e2dbfeb73186f8202 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 28 16:01:38 2014 +0100 Add to BR: findutils. --- debian/changelog | 1 + x2goserver.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index f48ecec..c11c05b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + Add to R (x2goserver): perl(File::BaseDir). + Don't hard-code /var/lib/ in $HOME path of to-be-created user "x2gouser". + + Add to BR: findutils. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index 8954dfc..7dba679 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -22,6 +22,7 @@ Source3: %{name}-rpmlintrc BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif +BuildRequires: findutils BuildRequires: desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org