[X2Go-Commits] [x2gobroker] 01/01: x2gobroker.spec: Some path fixes for the new tmpfiles.d/.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 30 21:01:34 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 3855e2c2be579cf686aebbda38f71e5091cd11e0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 30 21:01:27 2018 +0200

    x2gobroker.spec: Some path fixes for the new tmpfiles.d/.
---
 x2gobroker.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/x2gobroker.spec b/x2gobroker.spec
index 3ca617b..798ab7f 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -400,11 +400,11 @@ sed -i logrotate/x2gobroker-daemon \
     -e 's/adm/root/'
 sed -i logrotate/x2gobroker-wsgi \
     -e 's/adm/root/'
-make %{?_smp_mflags} PREFIX="%_prefix" LIBDIR="%_libexecdir/x2go"
+make %{?_smp_mflags} PREFIX="%_prefix" LIBDIR="%_libexecdir"
 
 %install
 b="%buildroot"
-make install PREFIX="%_prefix" LIBDIR="%_libexecdir/x2go" DESTDIR="$b"
+make install PREFIX="%_prefix" LIBDIR="%_libexecdir" DESTDIR="$b"
 
 #
 # Somewhat distro specific (especially the paths), thus this was not
@@ -461,7 +461,7 @@ install -pm0755 %SOURCE1 \
 # 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"
+rm -f "%{buildroot}/%{_libexecdir}/tmpfiles.d/*.conf"
 %endif
 
 #
@@ -665,12 +665,12 @@ fi
 
 %if 0%{?suse_version}
 %post agent
-%set_permissions %{_libdir}/x2go/x2gobroker-agent
+%set_permissions %{_libexecdir}/x2go/x2gobroker-agent
 %set_permissions %{_localstatedir}/log/x2gobroker
 
 
 %verifyscript agent
-%verify_permissions -e %{_libdir}/x2go/x2gobroker-agent
+%verify_permissions -e %{_libexecdir}/x2go/x2gobroker-agent
 %verify_permissions -e %{_localstatedir}/log/x2gobroker
 %endif
 
@@ -730,7 +730,7 @@ fi
 %_sbindir/x2gobroker-authservice
 %_mandir/man8/x2gobroker-authservice.8*
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%_prefix/lib/tmpfiles.d/x2gobroker-authservice.conf
+%_libexecdir/tmpfiles.d/x2gobroker-authservice.conf
 %endif
 %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
 
@@ -753,7 +753,7 @@ fi
 %_sbindir/x2gobroker-loadchecker
 %_mandir/man8/x2gobroker-loadchecker.8*
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%_prefix/lib/tmpfiles.d/x2gobroker-loadchecker.conf
+%_libexecdir/tmpfiles.d/x2gobroker-loadchecker.conf
 %endif
 %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
 
@@ -777,7 +777,7 @@ fi
 %_mandir/man1/x2gobroker-daemon.1*
 %_mandir/man8/x2gobroker-daemon-debug.8*
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%_prefix/lib//tmpfiles.d/x2gobroker-daemon.conf
+%_libexecdir/tmpfiles.d/x2gobroker-daemon.conf
 %endif
 %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


More information about the x2go-commits mailing list