From 9c3d359b200af55df38a3dac7b061eb7b2258fff Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Wed, 19 Jul 2017 11:29:29 +0200 Subject: [PATCH] MultiMarkdown: fix conflict with mtools --- srcpkgs/MultiMarkdown/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/MultiMarkdown/template b/srcpkgs/MultiMarkdown/template index 25c2aa287b4..a3b41ba9cb5 100644 --- a/srcpkgs/MultiMarkdown/template +++ b/srcpkgs/MultiMarkdown/template @@ -1,7 +1,7 @@ # Template file for 'MultiMarkdown' pkgname=MultiMarkdown version=5.4.0 -revision=2 +revision=3 build_style=cmake _greg_git=265003c8cb3022183f48df3e2684336b788af39d _cheatsheet_git=199dae83cfd22254a7b329450e48aaedb8d4d2e9 @@ -17,7 +17,6 @@ checksum="1cc0385ffd6c821c265e970f81cc4ec009c7ecbbfb12e0e115c7bb5b33d09a83 ada9df7bbd158472c33e6d84b62d0fb39bedd094201f44af1581f0cb468cdc73 f0176ec41692f275ef4f94c5b8a59e991576abf28ba374d96c34599282509364" wrksrc=$pkgname-5-$version -conflicts="mtools>0" # /usr/bin/mmd if [ "$CROSS_BUILD" ]; then hostmakedepends+=" $pkgname" @@ -35,8 +34,10 @@ pre_configure() { touch build/README.html } -# TODO: markdown alternatives post_install() { - mv $DESTDIR/usr/bin/markdown $DESTDIR/usr/bin/mmd_markdown + # TODO: markdown alternatives + mv ${DESTDIR}/usr/bin/markdown ${DESTDIR}/usr/bin/multimarkdown-markdown + # Avoid conflict with mtools + mv ${DESTDIR}/usr/bin/mmd ${DESTDIR}/usr/bin/multimarkdown-mmd vlicense LICENSE.txt LICENSE }