From d9d8b8f8eb5645dd238b90fc4d65e37e539bc5cd Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 17 Nov 2017 09:21:02 +0300 Subject: [PATCH] moreutils: Fix conflict with parallels package --- moreutils/PKGBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/moreutils/PKGBUILD b/moreutils/PKGBUILD index 2a6d44c3..d2e9748b 100644 --- a/moreutils/PKGBUILD +++ b/moreutils/PKGBUILD @@ -11,10 +11,15 @@ makedepends=('docbook-xml' 'git') source=("git+https://git.joeyh.name/git/moreutils.git#tag=$pkgver") sha256sums=('SKIP') -package() { - cd "$srcdir"/$pkgname - install_dir="$pkgdir"/usr - make DOCBOOKXSL="$(ls -d /usr/share/xml/docbook/xsl-stylesheets-* | tail --lines=1)" - rename .exe '' *.exe - make PREFIX="$install_dir" install +build() { + cd "${srcdir}"/${pkgname} + make DOCBOOKXSL="$(ls -d /usr/share/xml/docbook/xsl-stylesheets-* | tail --lines=1)" + rename .exe '' *.exe +} + +package() { + cd "${srcdir}"/${pkgname} + make PREFIX="${pkgdir}"/usr install + # Conflict with parallel package + rm -f "${pkgdir}"/usr/share/man/man1/parallel.1 }