This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from e471b58e debian/changelog: fixup and sort chronologically. new bd0c65b3 x2goserver.spec: escape percent signs in comments, getting rid of warnings in obs-build's spec file parser. new aa6882b7 x2goserver-xsession/Makefile: drop useless use of cat, add debugging to see whether symlinks or a directory has been added. new 215240a2 x2goserver-xsession/Makefile: support Tumbleweed with Xresources in /usr/etc. new 0ffcf4ef x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for Xresources symlink. new 135419f6 x2goserver-xsession/etc/Xsession: check for *SuSE via /usr/lib/os-release and /etc/os-release and generally refine checking layout a bit. The 5 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 | 11 +++++++++++ x2goserver-xsession/Makefile | 11 +++++++++-- x2goserver-xsession/etc/Xsession | 11 ++++++++++- x2goserver.spec | 10 ++++++++-- 4 files changed, 38 insertions(+), 5 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 bd0c65b3e5d10f02881a1123852d625455208620 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 21:15:19 2023 +0100 x2goserver.spec: escape percent signs in comments, getting rid of warnings in obs-build's spec file parser. --- debian/changelog | 2 ++ x2goserver.spec | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3bc0f7e..21af52b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -416,6 +416,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium might be something like '2'. - x2goserver/bin/x2goresume-session: fix clipboard handling. The "${clipboard}" variable already includes the "clipboard" key. + - x2goserver.spec: escape percent signs in comments, getting rid of + warnings in obs-build's spec file parser. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver.spec b/x2goserver.spec index 57cc91c0..09374814 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -904,10 +904,11 @@ fi %if ( ! 0%{?suse_version} ) || 0%{?suse_version} >= 1210 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %endif +### Make sure to unescape the percent signs if you really intend to use that! ### polkit (<= 0.105) -#%config(noreplace) %{_sysconfdir}/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla +#%%config(noreplace) %%{_sysconfdir}/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla ## polkit (>= 0.106) -#%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/x2goserver-no-colord.rules +#%%config(noreplace) %%{_sysconfdir}/polkit-1/rules.d/x2goserver-no-colord.rules %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm -- Alioth's /home/x2go-admin/maintenancescripts/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 aa6882b7864b233e274879e63a71f3939c7ea185 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 21:43:04 2023 +0100 x2goserver-xsession/Makefile: drop useless use of cat, add debugging to see whether symlinks or a directory has been added. --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 21af52b3..47efce12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -418,6 +418,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium "${clipboard}" variable already includes the "clipboard" key. - x2goserver.spec: escape percent signs in comments, getting rid of warnings in obs-build's spec file parser. + - x2goserver-xsession/Makefile: drop useless use of cat, add debugging to + see whether symlinks or a directory has been added. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ea15a314..8825d884 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -60,7 +60,7 @@ install_config: if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi - if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi + if [ -e /etc/os-release ] && grep "suse" 1>/dev/null < /etc/os-release || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) -v $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) -v $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi install_man: -- Alioth's /home/x2go-admin/maintenancescripts/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 215240a20d286580b106896e4950836bd78ad1c4 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 21:51:27 2023 +0100 x2goserver-xsession/Makefile: support Tumbleweed with Xresources in /usr/etc. --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47efce12..5d7d9abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -420,6 +420,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium warnings in obs-build's spec file parser. - x2goserver-xsession/Makefile: drop useless use of cat, add debugging to see whether symlinks or a directory has been added. + - x2goserver-xsession/Makefile: support Tumbleweed with Xresources in + /usr/etc. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 8825d884..d2cea16b 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -54,7 +54,14 @@ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) # provide target dirs for X11 related symlinks $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ + # *SuSE moved this to /usr/etc for later releases (currently Tumbleweed). + # Prefer this location. + for xres_prefix in '/usr' '/'; do \ + if [ -d "$${xres_prefix}/etc/X11/Xresources" ]; then \ + $(INSTALL_SYMLINK) "$${xres_prefix}/etc/X11/Xresources" $(DESTDIR)$(ETCDIR)/ ; \ + break; \ + fi; \ + done if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.d; $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi -- Alioth's /home/x2go-admin/maintenancescripts/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 0ffcf4efb7be89b7ea0d4baac2ec3cb0f2290032 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 21:51:43 2023 +0100 x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for Xresources symlink. --- debian/changelog | 2 ++ x2goserver.spec | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5d7d9abf..ac55391a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -422,6 +422,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium see whether symlinks or a directory has been added. - x2goserver-xsession/Makefile: support Tumbleweed with Xresources in /usr/etc. + - x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for + Xresources symlink. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver.spec b/x2goserver.spec index 09374814..f17f89bf 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1107,7 +1107,12 @@ fi %if 0%{?fedora} || 0%{?rhel} %{_sysconfdir}/x2go/Xclients.d %endif +# Support UsrEtc(Move) on *SuSE. +%if 0%{?suse_version} >= 1500 +usr%{_sysconfdir}/x2go/Xresources +%else %{_sysconfdir}/x2go/Xresources +%endif %config(noreplace) %{_sysconfdir}/x2go/Xsession %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features %{_datadir}/x2go/versions/VERSION.x2goserver-xsession -- Alioth's /home/x2go-admin/maintenancescripts/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 135419f63f611847630813d3b3f706c46ed6da83 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 21:58:24 2023 +0100 x2goserver-xsession/etc/Xsession: check for *SuSE via /usr/lib/os-release and /etc/os-release and generally refine checking layout a bit. --- debian/changelog | 3 +++ x2goserver-xsession/etc/Xsession | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ac55391a..84294b52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -424,6 +424,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium /usr/etc. - x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for Xresources symlink. + - x2goserver-xsession/etc/Xsession: check for *SuSE via + /usr/lib/os-release and /etc/os-release and generally refine checking + layout a bit. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 6466bc4d..cc03e6a5 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -167,7 +167,16 @@ if [ -f /etc/debian_version ] || [ -f /etc/devuan_version ]; then done set -e fi -elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ] || [ -f /etc/slackware-version ]; then +elif [ -f /etc/redhat-release ] || \ + [ -f /etc/gentoo-release ] || \ + { \ + { [ -e '/usr/lib/os-release' ] && grep 'suse' < '/usr/lib/os-release' 1>'/dev/null' ; } || \ + { [ -e '/etc/os-release' ] && grep 'suse' < '/etc/os-release' 1>'/dev/null' ; } || \ + [ -f /etc/SUSE-brand ] || \ + [ -f /etc/SuSE-release ] ; \ + } || \ + [ -f /etc/os-rt-release ] || \ + [ -f /etc/slackware-version ]; then # define a fallback... (should never be needed). The XSESSION_EXEC var gets set in # X2Go's x2goruncommand script and can be used with obsolete switchdesk or with -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org