[packages/lastlog2] - fix systemd unnit dir

baggins baggins at pld-linux.org
Sat Dec 23 13:20:54 CET 2023


commit fa50b908c2e08d21aefd1d7b62d7f9e0380802ae
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 23 12:24:54 2023 +0100

    - fix systemd unnit dir

 lastlog2.spec   | 2 +-
 split-usr.patch | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/lastlog2.spec b/lastlog2.spec
index afa28c3..c7ef161 100644
--- a/lastlog2.spec
+++ b/lastlog2.spec
@@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liblastlog2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblastlog2.so.1
 %{_mandir}/man8/lastlog2.8*
-%{_prefix}%{systemdunitdir}/lastlog2-import.service
+%{systemdunitdir}/lastlog2-import.service
 %{systemdtmpfilesdir}/lastlog2.conf
 %dir /var/lib/lastlog
 %ghost /var/lib/lastlog/lastlog2.db
diff --git a/split-usr.patch b/split-usr.patch
index a4cb26d..9be918f 100644
--- a/split-usr.patch
+++ b/split-usr.patch
@@ -1,5 +1,14 @@
 --- lastlog2-1.2.0/meson.build~	2023-09-08 10:46:34.000000000 +0200
 +++ lastlog2-1.2.0/meson.build	2023-12-23 11:27:26.872550177 +0100
+@@ -89,7 +89,7 @@
+ if prefixdir != rootprefixdir and rootprefixdir != '/' and not prefixdir.strip('/').startswith(rootprefixdir.strip('/') + '/')
+         error('Prefix is not below root prefix (now rootprefix=@0@ prefix=@1@)'.format(rootprefixdir, prefixdir))
+ endif
+-systemunitdir = prefixdir / 'lib/systemd/system'
++systemunitdir = '/lib/systemd/system'
+ tmpfilesdir = prefixdir / 'lib/tmpfiles.d'
+ 
+ libpam = cc.find_library('pam')
 @@ -143,12 +143,13 @@
             lastlog2_c, 
             include_directories : inc,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lastlog2.git/commitdiff/fa50b908c2e08d21aefd1d7b62d7f9e0380802ae



More information about the pld-cvs-commit mailing list