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 ff97070 x2goserver.spec: create applications file in %install section, not %pre. new 759c973 x2goserver/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. new f91152b x2goserver/: move etc/tmpfiles.d to gen-lib/tmpfiles.d. new 463621b debian/x2goserver.install: move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. new da74ae7 x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. The 4 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 | 5 +++++ debian/x2goserver.install | 2 +- x2goserver.spec | 4 ++-- x2goserver/Makefile | 8 ++++---- x2goserver/{etc => gen-lib}/tmpfiles.d/x2goserver.conf | 0 5 files changed, 12 insertions(+), 7 deletions(-) rename x2goserver/{etc => gen-lib}/tmpfiles.d/x2goserver.conf (100%) -- 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 release/4.0.1.x in repository x2goserver. commit 759c973e4dde1f64a171b7819be819169c35427f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:00:00 2018 +0100 x2goserver/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. File should not be modified by users. --- debian/changelog | 2 ++ x2goserver/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 058a282..c06f990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium etc/tmpfiles.d/x2goserver.conf. - x2goserver-xsession/etc/Xsession: change interpreter to bash. Some tests do not work in other shells. + - x2goserver/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. + File should not be modified by users. * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver/Makefile b/x2goserver/Makefile index e7b9698..1128fbb 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -89,8 +89,8 @@ install_config: $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ $(INSTALL_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(INSTALL_FILE) etc/logcheck/ignore.d.server/x2goserver $(DESTDIR)/etc/logcheck/ignore.d.server/ - $(INSTALL_DIR) $(DESTDIR)/etc/tmpfiles.d || true - $(INSTALL_FILE) etc/tmpfiles.d/x2goserver.conf $(DESTDIR)/etc/tmpfiles.d/ + $(INSTALL_DIR) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d || true + $(INSTALL_FILE) gen-lib/tmpfiles.d/x2goserver.conf $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -129,8 +129,8 @@ uninstall_config: $(RM_FILE) $(DESTDIR)/etc/logcheck/ignore.d.server/x2goserver $(RM_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(RM_DIR) $(DESTDIR)/etc/logcheck || true - $(RM_FILE) $(DESTDIR)/etc/tmpfiles.d/x2goserver.conf - $(RM_DIR) $(DESTDIR)/etc/tmpfiles.d || true + $(RM_FILE) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/x2goserver.conf + $(RM_DIR) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done -- 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 release/4.0.1.x in repository x2goserver. commit f91152b9d51f6287d65a3cfaecb2a6b85e565203 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:02:11 2018 +0100 x2goserver/: move etc/tmpfiles.d to gen-lib/tmpfiles.d. --- debian/changelog | 1 + x2goserver/{etc => gen-lib}/tmpfiles.d/x2goserver.conf | 0 2 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index c06f990..e906169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium do not work in other shells. - x2goserver/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. File should not be modified by users. + - x2goserver/: move etc/tmpfiles.d to gen-lib/tmpfiles.d. * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver/etc/tmpfiles.d/x2goserver.conf b/x2goserver/gen-lib/tmpfiles.d/x2goserver.conf similarity index 100% rename from x2goserver/etc/tmpfiles.d/x2goserver.conf rename to x2goserver/gen-lib/tmpfiles.d/x2goserver.conf -- 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 release/4.0.1.x in repository x2goserver. commit 463621b1dbb9cb8b6b5e0c0b542d6c2ec04e2f61 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:05:44 2018 +0100 debian/x2goserver.install: move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. --- debian/changelog | 1 + debian/x2goserver.install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e906169..1ddd3eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - Create applications file in %install section, not %pre. * debian/x2goserver.install: - Install new /etc/tmpfiles.d/x2goserver.conf conffile. + - Move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 919d412..452f6d9 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -4,7 +4,7 @@ x2goserver/lib/x2go* /usr/lib/x2go/ x2goserver/etc/x2go* /etc/x2go/ x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d x2goserver/etc/logcheck/ignore.d.server/x2goserver /etc/logcheck/ignore.d.server/ -x2goserver/etc/tmpfiles.d/x2go* /etc/tmpfiles.d/ +x2goserver/gen-lib/tmpfiles.d/x2go* /usr/lib/tmpfiles.d/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ -- 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 release/4.0.1.x in repository x2goserver. commit da74ae701e7c14e12f968c04a0ccbffca4a0590f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:09:39 2018 +0100 x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. --- debian/changelog | 1 + x2goserver.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ddd3eb..62c78cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,6 +108,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium removal is only executed on real package erases (i.e., not also during package upgrades). - Create applications file in %install section, not %pre. + - Move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. * debian/x2goserver.install: - Install new /etc/tmpfiles.d/x2goserver.conf conffile. - Move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. diff --git a/x2goserver.spec b/x2goserver.spec index 5141aec..f029da2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -479,7 +479,7 @@ rm -f "%{buildroot}/etc/sudoers.d/x2goserver" # Delete tmpfiles.d configuration file on systems # not using systemd. %if ( ! 0%{?fedora} ) && ( ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1210 ) ) -rm -f "%{buildroot}/etc/tmpfiles.d/x2goserver.conf" +rm -f "%{buildroot}/%{_prefix}/lib/tmpfiles.d/x2goserver.conf" %endif # Dummy file - will be created/removed in post* scriptlets. @@ -663,7 +663,7 @@ fi %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf %config(noreplace) %{_sysconfdir}/x2go/x2gosql/ %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%{_prefix}/lib/tmpfiles.d/x2goserver.conf %endif %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org