This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 174ee1d Forceful BR on glib2-branding-SLE for SUSE <= 11.2. new f07f555 fix for last commit new 8faaa8b fix SUSE version check new 393967f On SUSE, add permissions.d/x2goserver. 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 | 1 + x2goserver.spec | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 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 master in repository x2goserver. commit f07f55559447c292cb9e250590ea04af5175df23 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:29:55 2015 +0100 fix for last commit --- x2goserver.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index b2831aa..39b9011 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -548,14 +548,14 @@ fi %if 0%{?suse_version} %if 0%{?suse_version} <= 1130 -%run permissions +%run_permissions %else %set_permissions %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper %endif %verifyscript -n perl-X2Go-Server-DB -%verify permissions -e %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper +%verify_permissions -e %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper %endif @@ -587,6 +587,7 @@ exit 0 %endif %config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver +%config(noreplace) %{_sysconfdir}/permissions.d/%name %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm @@ -659,6 +660,7 @@ exit 0 %files -n perl-X2Go-Server-DB %defattr(-,root,root) %dir %{_libdir}/x2go +%config(noreplace) %{_sysconfdir}/permissions.d/perl-X2Go-Server-DB %{perl_vendorlib}/X2Go/Server/DB* %attr(2775,root,x2gouser) %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl -- 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 master in repository x2goserver. commit 8faaa8b0522acb856172cb599914528a50017632 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:36:54 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 39b9011..cce9b49 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -126,7 +126,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 master in repository x2goserver. commit 393967f349d97b7f2d68683b4a3f2ac3823545f5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 11:45:47 2015 +0100 On SUSE, add permissions.d/x2goserver. --- debian/changelog | 1 + x2goserver.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e76532d..2bae5a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -257,6 +257,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 cce9b49..8e067bd 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -472,6 +472,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/perl-X2Go-Server-DB" <<-EOF + %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper root:x2gouser 02755 +EOF %pre common if getent group x2gouser 1>/dev/null; then @@ -587,7 +592,6 @@ exit 0 %endif %config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver -%config(noreplace) %{_sysconfdir}/permissions.d/%name %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org