summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 102aac7bfb08..6f8ee7c11af4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Apr 5 21:12:37 UTC 2016
+# Thu Apr 7 00:57:33 UTC 2016
pkgbase = mc-git
pkgdesc = a text based filemanager
pkgver = 4.8.16.r15.g50cca69
@@ -35,7 +35,7 @@ pkgbase = mc-git
optdepends = zip: uzip extfs
optdepends = p7zip: support for 7zip archives
provides = mc=4.8.16
- conflicts = mc-
+ conflicts = mc
conflicts = mc-cvs
conflicts = mc-fork-svn
conflicts = mc-mp
diff --git a/PKGBUILD b/PKGBUILD
index 9ed2416303a4..c92b64b0369a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ optdepends=(
'p7zip: support for 7zip archives')
makedepends=('git' 'libxt' 'libx11')
provides=("mc=${pkgver%%.r*}")
-conflicts=(mc-{,cvs,fork-svn,mp,slavz,suse})
+conflicts=(mc{,-cvs,-fork-svn,-mp,-slavz,-suse})
backup=('etc/mc/edit.indent.rc'
'etc/mc/filehighlight.ini'
'etc/mc/mcedit.menu'