core/systemd to 240.95-2

core/systemd/PKGBUILD

@@ -8,11 +8,11 @@
 #  - patch to whitelist cacheflush syscall
 
 pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat')
+pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
 # Can be from either systemd or systemd-stable
 _commit='0430af90ef28a229e51136ad364e1da7e76c8638'
 pkgver=240.95
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -121,6 +121,9 @@ build() {
     -Dgnu-efi=false
     -Dima=false
     -Dlibidn2=true
+    # TODO: enable for v241
+    #-Dversion-tag="${pkgver}-${pkgrel}-arch"
+
     -Dlz4=true
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
@@ -149,7 +152,7 @@ package_systemd() {
   license=('GPL2' 'LGPL2.1')
   groups=('base-devel')
   depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
-           'libgcrypt' 'libsystemd' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
+           'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
            'libseccomp' 'util-linux' 'xz' 'pcre2' 'audit')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
@@ -181,9 +184,9 @@ package_systemd() {
   # we'll create this on installation
   rmdir "$pkgdir"/var/log/journal/remote
 
-  # runtime libraries shipped with libsystemd
-  install -d -m0755 libsystemd
-  mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* libsystemd
+  # runtime libraries shipped with systemd-libs
+  install -d -m0755 systemd-libs
+  mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs
 
   # manpages shipped with systemd-sysvcompat
   rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
@@ -231,14 +234,16 @@ package_systemd() {
   install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
 }
 
-package_libsystemd() {
+package_systemd-libs() {
   pkgdesc='systemd client libraries'
   depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
   license=('LGPL2.1')
-  provides=('libsystemd.so' 'libudev.so')
+  provides=('libsystemd' 'libsystemd.so' 'libudev.so')
+  conflicts=('libsystemd')
+  replaces=('libsystemd')
 
   install -d -m0755 "$pkgdir"/usr
-  mv libsystemd "$pkgdir"/usr/lib
+  mv systemd-libs "$pkgdir"/usr/lib
 }
 
 package_systemd-resolvconf() {