This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goadmincenter. from e7384c2 "Application" from Categories= field. Add key "Network" to Categories= field. * new 05bc36b Add permissions.d/adminserver for SUSE builds. The 1 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 | 2 +- x2goadmincenter.spec | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit 05bc36b9005dcc20357dd9dd1baa0c4cec1dc4b6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 13:52:00 2015 +0100 Add permissions.d/adminserver for SUSE builds. --- debian/changelog | 2 +- x2goadmincenter.spec | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d3282f9..3dfe858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low + Own directory %{_libdir}/cgi-bin/. + Always set BuildRoot: parameter. + On SUSE <= 11.3: Mark x2goadmincenter.desktop as non-translatable. - * + + Add permissions.d/adminserver for SUSE builds. [ Martti Pitkanen ] * Upstream version 0.0.0.1 (initial release): diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index 5e0591e..18c5f7c 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -108,6 +108,12 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop +%if 0%{?suse_version} +mkdir -p "%{buildroot}/%_sysconfdir/permissions.d" +cat > "%{buildroot}/%_sysconfdir/permissions.d/x2goadminserver" <<-EOF +%{_libdir}/cgi-bin/x2gorpcserver.cgi root:root 0755 +EOF +%endif %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -125,8 +131,11 @@ fi %if 0%{?suse_version} %post -n x2goadminserver +%if 0%{?suse_version} <= 1130 +%run_permissions +%else %set_permissions {_libdir}/cgi-bin/x2gorpcserver.cgi - +%endif %verifyscript -n x2goadminserver %verify_permissions -e {_libdir}/cgi-bin/x2gorpcserver.cgi @@ -166,6 +175,7 @@ fi %defattr(-,root,root) %dir %{_sysconfdir}/x2go/ %config %{_sysconfdir}/x2go/x2goadminserver.conf +%config %{_sysconfdir}/permissions.d/x2goadminserver %dir %{_libdir}/x2go/ %{_libdir}/x2go/ %dir %{_libdir}/cgi-bin/ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
-
git-admin＠x2go.org