From ccd00bbb37083185558a62460b6465c0585e7e2c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 29 Sep 2015 14:39:13 -0300
Subject: systemd-226-3.parabola1: avoid mv'ing things in package functions

* as a side effect, nss libs are moved to libsystemd
* drop libnss* from systemd package
---
 libre/systemd/PKGBUILD | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'libre/systemd/PKGBUILD')

diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 9f808e2c1..54e8eeeff 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=systemd
 pkgname=systemd
 pkgver=226
-pkgrel=1.parabola1
+pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam'
@@ -144,17 +144,11 @@ package_systemd() {
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-
-  ### split off runtime libraries
-  rm -rf "$srcdir/_libsystemd"
-  install -dm755 "$srcdir"/_libsystemd/usr/lib
-  cd "$srcdir"/_libsystemd
-  mv "$pkgdir"/usr/lib/lib{systemd,udev}*.so* usr/lib
+  ### manpages shipped with systemd-sysvcompat
+  rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+
+  ### runtime libraries shipped with libsystemd
+  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
 
   # add example bootctl configuration
   install -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf
-- 
cgit v1.2.3