This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 38940acccdd49531dd26ee260204725bf435241b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 19:30:37 2018 +0200 tmpfiles.d: Grmpf... &%(/&21766%... They go to /usr/lib, not /usr/share/. --- Makefile | 23 ++++++++++++----------- debian/x2gobroker-authservice.install | 2 +- debian/x2gobroker-daemon.install | 2 +- debian/x2gobroker-loadchecker.install | 2 +- x2gobroker.spec | 12 +++++++++--- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 61690e2..adf1aac 100755 --- a/Makefile +++ b/Makefile @@ -40,10 +40,11 @@ PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go +LIBDIR ?= $(PREFIX)/lib DATADIR ?= $(PREFIX)/share MANDIR=$(DATADIR)/man -SHAREDIR=$(DATADIR)/x2go + +X2GO_LIBDIR=$(LIBDIR)/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) @@ -60,7 +61,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_pymodule build_setuidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(X2GO_LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(BINDIR)/x2gobroker\" -o bin/x2gobroker-ssh src/x2gobroker-ssh.c build_pymodule: @@ -100,18 +101,18 @@ install: if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then ${INSTALL_FILE} pam/x2gobroker.SUSE "${DESTDIR}/etc/pam.d/x2gobroker"; fi # x2gobroker-agent - mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \ + mkdir -p "${DESTDIR}${X2GO_LIBDIR}" "${DESTDIR}${SBINDIR}" \ "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \ "${DESTDIR}${MANDIR}/man8" $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8 - ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" + ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${X2GO_LIBDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" # x2gobroker-authservice mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(DATADIR)/tmpfiles.d/" + "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(LIBDIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-authservice.default \ "${DESTDIR}/etc/default/x2gobroker-authservice" ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ @@ -123,12 +124,12 @@ install: ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" ${INSTALL_FILE} tmpfiles.d/x2gobroker-authservice.conf \ - "${DESTDIR}${DATADIR}/tmpfiles.d/" + "${DESTDIR}${LIBDIR}/tmpfiles.d/" # x2gobroker-loadchecker mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(DATADIR)/tmpfiles.d/" + "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(LIBDIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-loadchecker.default \ "${DESTDIR}/etc/default/x2gobroker-loadchecker" ${INSTALL_FILE} man/man8/x2gobroker-loadchecker.8* \ @@ -140,11 +141,11 @@ install: ${INSTALL_FILE} etc/broker/x2gobroker-loadchecker-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" ${INSTALL_FILE} tmpfiles.d/x2gobroker-loadchecker.conf \ - "${DESTDIR}${DATADIR}/tmpfiles.d/" + "${DESTDIR}${LIBDIR}/tmpfiles.d/" # x2gobroker-daemon mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" \ - "$(DESTDIR)$(DATADIR)/tmpfiles.d/" + "$(DESTDIR)$(LIBDIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-daemon.default \ "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ @@ -162,7 +163,7 @@ install: ${INSTALL_PROGRAM} sbin/x2gobroker-daemon-debug \ "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} tmpfiles.d/x2gobroker-daemon.conf \ - "${DESTDIR}${DATADIR}/tmpfiles.d/" + "${DESTDIR}${LIBDIR}/tmpfiles.d/" # x2gobroker-ssh mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ diff --git a/debian/x2gobroker-authservice.install b/debian/x2gobroker-authservice.install index a85b54a..47f562a 100644 --- a/debian/x2gobroker-authservice.install +++ b/debian/x2gobroker-authservice.install @@ -1,5 +1,5 @@ usr/sbin/x2gobroker-authservice etc/logrotate.d/x2gobroker-authservice etc/x2go/broker/x2gobroker-authservice-logger.conf -usr/share/tmpfiles.d/x2gobroker-authservice.conf +usr/lib/tmpfiles.d/x2gobroker-authservice.conf usr/share/man/man8/x2gobroker-authservice.8* diff --git a/debian/x2gobroker-daemon.install b/debian/x2gobroker-daemon.install index 31e94c0..2677169 100644 --- a/debian/x2gobroker-daemon.install +++ b/debian/x2gobroker-daemon.install @@ -1,5 +1,5 @@ etc/logrotate.d/x2gobroker-daemon usr/sbin/x2gobroker-daemon-debug -usr/share/tmpfiles.d/x2gobroker-daemon.conf +usr/lib/tmpfiles.d/x2gobroker-daemon.conf usr/share/man/man1/x2gobroker-daemon.1* usr/share/man/man8/x2gobroker-daemon-debug.8* diff --git a/debian/x2gobroker-loadchecker.install b/debian/x2gobroker-loadchecker.install index 481ea76..49d1c8f 100644 --- a/debian/x2gobroker-loadchecker.install +++ b/debian/x2gobroker-loadchecker.install @@ -1,5 +1,5 @@ usr/sbin/x2gobroker-loadchecker etc/logrotate.d/x2gobroker-loadchecker etc/x2go/broker/x2gobroker-loadchecker-logger.conf -usr/share/tmpfiles.d/x2gobroker-loadchecker.conf +usr/lib/tmpfiles.d/x2gobroker-loadchecker.conf usr/share/man/man8/x2gobroker-loadchecker.8* diff --git a/x2gobroker.spec b/x2gobroker.spec index 9ee1102..4eb41d1 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -441,6 +441,12 @@ install -pm0755 %SOURCE1 \ %endif %endif +# 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}/%{_prefix}/lib/tmpfiles.d/*.conf" +%endif + # # Totally distro-specific # @@ -706,7 +712,7 @@ fi %config %_sysconfdir/logrotate.d/x2gobroker-authservice %_sbindir/x2gobroker-authservice %_mandir/man8/x2gobroker-authservice.8* -%_datadir/tmpfiles.d/x2gobroker-authservice.conf +%{_prefix}/lib/tmpfiles.d/x2gobroker-authservice.conf %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker @@ -727,7 +733,7 @@ fi %config %_sysconfdir/logrotate.d/x2gobroker-loadchecker %_sbindir/x2gobroker-loadchecker %_mandir/man8/x2gobroker-loadchecker.8* -%_datadir/tmpfiles.d/x2gobroker-loadchecker.conf +%{_prefix}/lib/tmpfiles.d/x2gobroker-loadchecker.conf %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker @@ -749,7 +755,7 @@ fi %_sbindir/x2gobroker-daemon-debug %_mandir/man1/x2gobroker-daemon.1* %_mandir/man8/x2gobroker-daemon-debug.8* -%_datadir/tmpfiles.d/x2gobroker-daemon.conf +%{_prefix}/lib//tmpfiles.d/x2gobroker-daemon.conf %config %_sysconfdir/logrotate.d/x2gobroker-daemon %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git