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 cb54eb7 x2goserver.spec: On SUSE, add permissions.d/x2goserver. new 11a6848 fix for last commit new b2b9324 fix SUSE version check new 41d2464 Revert "x2goserver.spec: On SUSE, add permissions.d/x2goserver." new 0c3f4a5 On SUSE, add permissions.d/x2goserver. new 94dd32e fix for cb54eb71 new 2d94c67 fix for 0c3f4a5c The 6 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: x2goserver.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 11a6848f15a56240f470b84e723aa61be8dcdb49 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:29:55 2015 +0100 fix for last commit --- x2goserver.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 65b29df..2319741 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -387,7 +387,7 @@ cat > "%{buildroot}/%_sysconfdir/permissions.d/%name" <<-EOF %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper root:x2gouser 02755 EOF %if 0%{?suse_version} <= 1130 -%run permissions +%run_permissions %else %set_permissions %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper %endif @@ -430,7 +430,7 @@ fi %if 0%{?suse_version} %verifyscript -%verify permissions -e %{_libdir}/x2go/x2gosqlitewrapper +%verify_permissions -e %{_libdir}/x2go/x2gosqlitewrapper %endif @@ -462,6 +462,7 @@ exit 0 %endif %config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver +%config(noreplace) %{_sysconfdir}/permissions.d/%name %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x2go* %{_bindir}/x2go* -- 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 0c3f4a5c7de217b0d80176c2b2b43b6987b26ab4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:38:24 2015 +0100 On SUSE, add permissions.d/x2goserver. --- debian/changelog | 1 + x2goserver.spec | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2117788..eb7c375 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,6 +108,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + "%set_permissions" / "%verify_permissions" macros are not know in SLE <= 11.3. Using "%run permissions" and "%verify permissions" instead. + Forceful BR on glib2-branding-SLES for SUSE <= 11.2. + + On SUSE, add permissions.d/x2goserver. [ Matthew L. Dailey ] * New upstream version (4.0.1.19): diff --git a/x2goserver.spec b/x2goserver.spec index 42a80e7..e3c4ae7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -382,6 +382,10 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi %if 0%{?suse_version} +mkdir -p "%{buildroot}/%_sysconfdir/permissions.d" +cat > "%{buildroot}/%_sysconfdir/permissions.d/%name" <<-EOF + %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper root:x2gouser 02755 +EOF %if 0%{?suse_version} <= 1130 %run_permissions %else -- 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 41d2464dad8008118421def29168c7f5c375b28c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:38:03 2015 +0100 Revert "x2goserver.spec: On SUSE, add permissions.d/x2goserver." This reverts commit cb54eb71e9633442617181e8930564925a6f73fb. --- debian/changelog | 1 - x2goserver.spec | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb7c375..2117788 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,7 +108,6 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + "%set_permissions" / "%verify_permissions" macros are not know in SLE <= 11.3. Using "%run permissions" and "%verify permissions" instead. + Forceful BR on glib2-branding-SLES for SUSE <= 11.2. - + On SUSE, add permissions.d/x2goserver. [ Matthew L. Dailey ] * New upstream version (4.0.1.19): diff --git a/x2goserver.spec b/x2goserver.spec index 8eafbf6..42a80e7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -361,7 +361,7 @@ getent passwd x2gouser 1>/dev/null || \ -c "x2go" x2gouser exit 0 -%if 0%{?suse_version} && 0%{?suse_version} >= 1210 +%if 0%{?suse_version} >= 1210 %service_add_pre x2goserver.service %endif @@ -382,10 +382,6 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi %if 0%{?suse_version} -mkdir -p "%{buildroot}/%_sysconfdir/permissions.d" -cat > "%{buildroot}/%_sysconfdir/permissions.d/%name" <<-EOF - %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper root:x2gouser 02755 -EOF %if 0%{?suse_version} <= 1130 %run_permissions %else -- 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 b2b9324fc91fb5c9f3f4ea934ff388bdb097652b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:37:25 2015 +0100 fix SUSE version check --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 2319741..8eafbf6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -127,7 +127,7 @@ Requires(preun): systemd Requires(postun): systemd %endif -%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} && 0%{?suse_version} >= 1210 %{?systemd_requires} %endif -- 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 94dd32ec87d1be57ae40deb28c1cd9cee1147596 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:42:26 2015 +0100 fix for cb54eb71 --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index e3c4ae7..c722707 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -384,7 +384,7 @@ fi %if 0%{?suse_version} mkdir -p "%{buildroot}/%_sysconfdir/permissions.d" cat > "%{buildroot}/%_sysconfdir/permissions.d/%name" <<-EOF - %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper root:x2gouser 02755 + %{_libdir}/x2go/x2gosqlitewrapper root:x2gouser 02755 EOF %if 0%{?suse_version} <= 1130 %run_permissions -- 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 2d94c678ec3339fde7b622a345fe0f3d332b2f5d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:46:42 2015 +0100 fix for 0c3f4a5c --- x2goserver.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index c722707..5c3b37c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -353,6 +353,11 @@ echo "Encoding=UTF-8" >> %{buildroot}%{_datadir}/applications/x2gofm.desktop %endif desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop +%if 0%{?suse_version} +mkdir -p "%{buildroot}/%_sysconfdir/permissions.d" +cat > "%{buildroot}/%_sysconfdir/permissions.d/%name" <<-EOF + %{_libdir}/x2go/x2gosqlitewrapper root:x2gouser 02755 +EOF %pre getent group x2gouser 1>/dev/null || groupadd -r x2gouser @@ -381,11 +386,6 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi fi -%if 0%{?suse_version} -mkdir -p "%{buildroot}/%_sysconfdir/permissions.d" -cat > "%{buildroot}/%_sysconfdir/permissions.d/%name" <<-EOF - %{_libdir}/x2go/x2gosqlitewrapper root:x2gouser 02755 -EOF %if 0%{?suse_version} <= 1130 %run_permissions %else -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org