Merge pull request #4331 from lemmi/moreutils

moreutils: move ts, issue #4282
This commit is contained in:
Toyam Cox 2016-06-14 03:36:43 -04:00 committed by GitHub
commit 256b6b0c90
2 changed files with 15 additions and 3 deletions

View File

@ -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

View File

@ -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
}