[packages/elogind/initscript] arch specific execdir

glen glen at pld-linux.org
Tue Aug 8 17:39:06 CEST 2017


commit 5bafef8cdeac948b0f32af2c28bd3e7dd42eeb59
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Aug 8 18:37:04 2017 +0300

    arch specific execdir

 elogind.init | 2 +-
 elogind.spec | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/elogind.spec b/elogind.spec
index 3007fdd..73e2946 100644
--- a/elogind.spec
+++ b/elogind.spec
@@ -2,7 +2,7 @@ Summary:	Elogind User, Seat and Session Manager
 Summary(pl.UTF-8):	Elogind - zarządca użytkowników, stanowisk i sesji
 Name:		elogind
 Version:	234.2
-Release:	1.1
+Release:	1.2
 License:	LGPL v2.1+
 Group:		Daemons
 # Source0Download: https://github.com/elogind/elogind/releases
@@ -151,13 +151,11 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+%{__sed} -i -e 's, at libexecdir@,%{_libexecdir}/%{name},' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libelogind.la \
 	$RPM_BUILD_ROOT/%{_lib}/security/*.la
 
-%{__sed} -i -e 's, at elogind@,%{_libexecdir}/%{name}/elogind,' \
-	$RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
-
 # provided by systemd-devel
 %{__rm} \
 	$RPM_BUILD_ROOT%{_mandir}/man3/SD_*.3 \
diff --git a/elogind.init b/elogind.init
index bd59ebf..26fc023 100755
--- a/elogind.init
+++ b/elogind.init
@@ -37,7 +37,7 @@ start() {
 	fi
 
 	msg_starting "elogind"
-	daemon --fork --pidfile $pidfile --makepid /usr/lib64/elogind/elogind
+	daemon --fork --pidfile $pidfile --makepid @libexecdir@/elogind
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/elogind
 }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/elogind.git/commitdiff/2d352a54de31b0054f4dcbfa964eb8b01381ade5



More information about the pld-cvs-commit mailing list