[arch-commits] Commit in mc/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Daniel Griffiths]

    Date: Saturday, February 13, 2010 @ 04:20:38
  Author: dgriffiths
Revision: 68543

Merged revisions 68541 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mc/trunk

........
  r68541 | dgriffiths | 2010-02-13 03:20:04 -0600 (Sat, 13 Feb 2010) | 2 lines
  
  Fixed conflict with p7zip
........

Modified:
  mc/repos/extra-x86_64/	(properties)
  mc/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


Property changes on: mc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mc/trunk:1-68492
   + /mc/trunk:1-68542

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-13 09:20:19 UTC (rev 68542)
+++ extra-x86_64/PKGBUILD	2010-02-13 09:20:38 UTC (rev 68543)
@@ -6,13 +6,15 @@
 
 pkgname=mc
 pkgver=4.7.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 arch=('i686' 'x86_64')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
 depends=('e2fsprogs' 'glib2' 'pcre' 'gpm>=1.20.4' 'slang')
 makedepends=('libxt' 'libx11')
+optdepends=('p7zip: support for 7zip archives')
+provides=('mcedit-pkgbuild-syntax')
 conflicts=('mc-utf8')
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
@@ -43,4 +45,7 @@
 	# Fix FS#15177
 	sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
 	    ${pkgdir}/usr/share/mc/extfs/uzip
+
+	# Fix FS#18312
+	rm ${pkgdir}/usr/share/mc/extfs/u7z
 }