From 0db39804155d461a2aec397ad8a55a33c0ea4316 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 14 Jun 2016 09:09:49 +0200 Subject: [PATCH] moreutils: move ts, issue #4282 --- srcpkgs/moreutils/INSTALL.msg | 8 ++++++++ srcpkgs/moreutils/template | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/moreutils/INSTALL.msg diff --git a/srcpkgs/moreutils/INSTALL.msg b/srcpkgs/moreutils/INSTALL.msg new file mode 100644 index 00000000000..f81cbb4191f --- /dev/null +++ b/srcpkgs/moreutils/INSTALL.msg @@ -0,0 +1,8 @@ +Since some tools of moreutils conflict with other package's names, the +corresponding files and their manpages are renamed: + +GNU parallel: + parallel -> moreutils-parallel + +Task Spooler: (https://github.com/voidlinux/void-packages/issues/4282) + ts -> moreutils-ts diff --git a/srcpkgs/moreutils/template b/srcpkgs/moreutils/template index 150b8ea8284..23381c7acf9 100644 --- a/srcpkgs/moreutils/template +++ b/srcpkgs/moreutils/template @@ -1,7 +1,7 @@ # Template file for 'moreutils' pkgname=moreutils version=0.59 -revision=1 +revision=2 build_style=gnu-makefile wrksrc="${pkgname}-${version}.orig" make_build_args="DOCBOOK2XMAN=docbook2man" @@ -16,6 +16,10 @@ checksum=a48e11c3197bf79a7bfaa121423e64626e3381d9fedc91d606e9724ae498d1b4 post_install() { # rename parallel to not conflict with gnu-parllel - mv ${DESTDIR}/usr/bin/{,moreutils_}parallel - mv ${DESTDIR}/usr/share/man/man1/{,moreutils_}parallel.1 + # rename ts: https://github.com/voidlinux/void-packages/issues/4282 + + for conflict in parallel ts; do + mv ${DESTDIR}/usr/bin/{,moreutils_}${conflict} + mv ${DESTDIR}/usr/share/man/man1/{,moreutils_}${conflict}.1 + done }