From 7c8ba901313707f6310c159df4176dedae01e719 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 27 Jul 2018 23:09:11 -0400 Subject: pcr/opensysusers: Split man5 off in to a separate package To avoid conflicting with systemd over the sysusers.d(5) manpage --- pcr/opensysusers/PKGBUILD | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'pcr/opensysusers') diff --git a/pcr/opensysusers/PKGBUILD b/pcr/opensysusers/PKGBUILD index 14eafad0f..5891e3256 100644 --- a/pcr/opensysusers/PKGBUILD +++ b/pcr/opensysusers/PKGBUILD @@ -3,10 +3,14 @@ # Contributor: Luke Shumaker # Maintainer (Artix): Chris Cromer +# Note: have opensysusers-manpages as a separate package, so that +# notsystemd (which also includes sysusers.d(5)) and opensysusers +# don't conflict. + pkgbase=opensysusers -pkgname=('opensysusers' 'opensysusers-systemdcompat') +pkgname=('opensysusers' 'opensysusers-manpages' 'opensysusers-systemdcompat') pkgver=0.4.8 -pkgrel=2 +pkgrel=3 pkgdesc="A standalone utility to handle systemd-style sysusers.d files" arch=('any') url="https://github.com/artix-linux/opensysusers" @@ -26,11 +30,16 @@ build() { package_opensysusers() { groups=('base-openrc') + optdepends=( + 'opensysusers-manpages' + 'opensysusers-systemdcompat' + ) cd "$srcdir/$pkgbase-$pkgver" install -d "$pkgdir"/usr/bin make PREFIX=/usr HAVESYSTEMD=no HAVEOPENRC=yes HAVEMAN=yes DESTDIR="$pkgdir" install find "$pkgdir" -type f -name 'systemd-*' -delete + rm -rf "$pkgdir"/usr/share/man/man5 find "$pkgdir" -depth -type d -empty -exec rmdir -- {} \; install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -43,6 +52,16 @@ package_opensysusers() { install -Dm0644 ../opensysusers.hook "$pkgdir"/usr/share/libalpm/hooks/opensysusers.hook } +package_opensysusers-manpages() { + conflicts=('systemd') # because of the sysusers.d(5) manpage + + cd "$srcdir/$pkgbase-$pkgver" + make PREFIX=/usr HAVESYSTEMD=no HAVEOPENRC=yes HAVEMAN=yes DESTDIR="$srcdir/manpages" install + install -d "$pkgdir"/usr/share/man + mv -T {"$srcdir/manpages","$pkgdir"}/usr/share/man/man5 + rm -rf "$srcdir/manpages" +} + package_opensysusers-systemdcompat() { depends=("opensysusers=$pkgver") pkgdesc='Compatibility wrapper for opensysfiles providing the systemd-sysfiles program' -- cgit v1.2.3