Mon Jan 4 12:10:55 UTC 2010

Author: jnovy

Update of /cvs/pkgs/rpms/mc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24825

Modified Files:
	.cvsignore mc-extensions.patch mc.spec sources 
Removed Files:
	mc-4.6.2-utf8.patch mc-64bit.patch 
	mc-cedit-configurable-highlight.patch mc-cedit.patch 
	mc-delcheck.patch mc-edit-segv.patch mc-etcmc.patch 
	mc-exit.patch mc-hintchk.patch mc-ipv6.patch mc-lzma.patch 
	mc-ministatus.patch mc-newlinedir.patch mc-oldrpmtags.patch 
	mc-prompt.patch mc-refresh.patch mc-shellcwd.patch 
	mc-showfree.patch mc-spaceprompt.patch mc-userhost.patch 
Log Message:
* Mon Jan  4 2010 Jindrich Novy <jnovy at redhat.com> 4.7.0.1
- update to 4.7.0.1
- update bindings to use xdg-open wherever possible



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38

--- .cvsignore	28 May 2009 08:29:04 -0000	1.37
+++ .cvsignore	4 Jan 2010 12:10:53 -0000	1.38
@@ -1 +1 @@
-mc-4.6.2.tar.gz
+mc-4.7.0.1.tar.lzma

mc-extensions.patch:
 configure.ac   |    2 +-
 misc/mc.ext.in |   51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 18 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/mc-extensions.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mc-extensions.patch	28 May 2009 08:29:04 -0000	1.12
+++ mc-extensions.patch	4 Jan 2010 12:10:54 -0000	1.13
@@ -1,7 +1,7 @@
-diff -up mc-4.6.2/configure.ac.extensions mc-4.6.2/configure.ac
---- mc-4.6.2/configure.ac.extensions	2009-02-01 20:30:21.000000000 +0100
-+++ mc-4.6.2/configure.ac	2009-05-26 14:42:48.000000000 +0200
-@@ -81,7 +81,7 @@ AC_PROG_LN_S
+diff -up mc-4.7.0-pre4/configure.ac.extensions mc-4.7.0-pre4/configure.ac
+--- mc-4.7.0-pre4/configure.ac.extensions	2009-10-30 19:44:38.000000000 +0100
++++ mc-4.7.0-pre4/configure.ac	2009-12-10 20:41:43.000000000 +0100
+@@ -69,7 +69,7 @@ AC_PROG_LN_S
  AC_CHECK_TOOL(AR, ar, ar)
  
  dnl Only list browsers here that can be run in background (i.e. with `&')
@@ -10,34 +10,10 @@ diff -up mc-4.6.2/configure.ac.extension
  
  dnl
  dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
-diff -up mc-4.6.2/configure.extensions mc-4.6.2/configure
---- mc-4.6.2/configure.extensions	2009-02-01 20:46:23.000000000 +0100
-+++ mc-4.6.2/configure	2009-05-26 14:42:48.000000000 +0200
-@@ -6843,7 +6843,7 @@ else
- fi
- 
- 
--for ac_prog in gnome-moz-remote mozilla konqueror opera netscape
-+for ac_prog in firefox gnome-moz-remote mozilla konqueror opera netscape
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-diff -up mc-4.6.2/lib/mc.ext.in.extensions mc-4.6.2/lib/mc.ext.in
---- mc-4.6.2/lib/mc.ext.in.extensions	2009-02-01 20:30:21.000000000 +0100
-+++ mc-4.6.2/lib/mc.ext.in	2009-05-26 14:44:46.000000000 +0200
-@@ -119,6 +119,11 @@ regex/\.t(ar\.bz2|bz|b2)$
- 	Open=%cd %p#utar
- 	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
- 
-+# .tar.lzma, .tlz
-+regex/\.t(ar\.lzma|lz)$
-+	Open=%cd %p#utar
-+	View=%view{ascii} lzma -dc %f 2>/dev/null | tar tvvf -
-+
- # .tar.F - used in QNX
- regex/\.tar\.F$
- 	# Open=%cd %p#utar
-@@ -198,8 +203,8 @@ regex/\.(rpm|spm)$
+diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in
+--- mc-4.7.0-pre4/misc/mc.ext.in.extensions	2009-10-29 20:02:37.000000000 +0100
++++ mc-4.7.0-pre4/misc/mc.ext.in	2009-12-10 20:46:47.000000000 +0100
+@@ -226,8 +226,8 @@ regex/\.rpm$
  
  # deb
  regex/\.u?deb$
@@ -46,101 +22,28 @@ diff -up mc-4.6.2/lib/mc.ext.in.extensio
 +	Open=%cd %p#uar
 +	View=%view{ascii} file %f && nm %f
  
- # ISO9660
- regex/\.iso$
-@@ -220,14 +225,25 @@ type/^ASCII\ mail\ text
- 
- # C
- shell/.c
--	Open=%var{EDITOR:vi} %f
-+	Include=editor
- 
- # Fortran
- shell/.f
--	Open=%var{EDITOR:vi} %f
-+	Include=editor
- 	
- # Header
--regex/\.(h|hpp)$
-+regex/\.([Hh]|[Hh]pp|HPP)$
-+	Include=editor
-+
-+# Asm
-+regex/\.([Ss]|[Aa]sm|ASM)$
-+	Include=editor
-+
-+# C++
-+regex/\.(C|cc|[Cc]pp|CPP)$
-+	Include=editor
-+
-+include/editor
- 	Open=%var{EDITOR:vi} %f
- 
- # Object
-@@ -251,10 +267,12 @@ regex/\.(te?xi|texinfo)$
- 
- # GNU Info page
- type/^Info\ text
--	Open=info -f %f
-+	#Open=info -f %f
-+	Open=pinfo %f
- 
- shell/.info
--	Open=info -f %f
-+	#Open=info -f %f
-+	Open=pinfo %f
- 
- # Manual page
- # Exception - .so libraries are not manual pages
-@@ -298,6 +316,10 @@ regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|
- 	Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
- 	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
- 
-+regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$
-+	Open=case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-+
- 
- ### Images ###
- 
-@@ -328,18 +350,24 @@ type/^PPM
- type/^Netpbm
- 	Include=image
- 
-+type/^JNG
-+	Include=image
-+
-+type/^MNG
-+	Include=image
-+
- shell/.xcf
- 	Open=(gimp %f &)
- 
- shell/.xbm
--	Open=bitmap %f
-+	Include=image
- 
- shell/.xpm
+ # dpkg
+ shell/.debd
+@@ -387,7 +387,7 @@ shell/.ico
  	Include=image
- 	View=sxpm %f
  
  include/image
 -	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
-+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (xdg-open %f &); fi
++	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (eog %f &); fi
  	View=%view{ascii} identify %f
  	#View=%view{ascii} asciiview %f
  
-@@ -347,7 +375,8 @@ include/image
+@@ -395,7 +395,8 @@ include/image
  ### Sound files ###
  
  regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
 -       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
-+	Open=play %f
++	Include=audio
 +#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
  
  regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
         Open=mikmod %f
-@@ -357,11 +386,16 @@ regex/\.([wW][aA][wW]22)$
+@@ -405,15 +406,22 @@ regex/\.([wW][aA][wW]22)$
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
@@ -153,14 +56,21 @@ diff -up mc-4.6.2/lib/mc.ext.in.extensio
 +regex/\.([mM][kK][aA])$
 +	Include=audio
  
- regex/\.([oO][gG][gG])$
+ regex/\.([oO][gG][gG|aA|vV|xX])$
 -	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
-+	Open=ogg123 %f
++	Include=audio
++#	Open=ogg123 %f
 +#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
  	View=%view{ascii} ogginfo %s
  
+ regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
+-	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Include=audio
++#	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
  regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
-@@ -371,11 +405,15 @@ regex/\.([wW][mM][aA])$
+ 	Open=timidity %f
+@@ -422,11 +430,15 @@ regex/\.([wW][mM][aA])$
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
@@ -177,96 +87,60 @@ diff -up mc-4.6.2/lib/mc.ext.in.extensio
  
  
  ### Video ###
-@@ -389,6 +427,9 @@ regex/\.([aA][sS][fFxX])$
- regex/\.([dD][iI][vV][xX])$
- 	Include=video
- 
-+regex/\.([mM][kK][vV])$
-+	Include=video
-+
- regex/\.([mM][oO][vV]|[qQ][tT])$
- 	Include=video
- 
-@@ -408,10 +449,11 @@ regex/\.([oO][gG][mM])$
- 	Include=video
- 
- regex/\.([rR][aA]?[mM])$
--	Open=(realplay %f >/dev/null 2>&1 &)
-+	Include=video
- 
- include/video
- 	Open=(mplayer %f >/dev/null 2>&1 &)
-+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
- 	#Open=(gtv %f >/dev/null 2>&1 &)
- 	#Open=(xanim %f >/dev/null 2>&1 &)
- 
-@@ -420,12 +462,13 @@ include/video
+@@ -471,12 +486,12 @@ include/video
  
  # Postscript
  type/^PostScript
 -	Open=(gv %f &)
-+	Open=(evince %f >/dev/null 2>&1 &)
++	Open=(xdg-open %f &)
  	View=%view{ascii} ps2ascii %f
  
  # PDF
  type/^PDF
 -	Open=(xpdf %f &)
-+	Open=(xdg-open %f >/dev/null 2>&1 &)
-+	#Open=(xpdf %f >/dev/null 2>&1 &)
++	Open=(xdg-open %f &)
  	#Open=(acroread %f &)
  	#Open=(ghostview %f &)
  	View=%view{ascii} pdftotext %f -
-@@ -436,7 +479,7 @@ type/^PDF
+@@ -486,7 +501,7 @@ type/^PDF
+ 
  # html
  regex/\.([hH][tT][mM][lL]?)$
- 	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
--	View=%view{ascii} lynx -dump -force_html %f
-+	View=%view{ascii} links -dump %f
+-	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
++	Open=xdg-open file://%d/%p 1>&2
+ 	View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
  
  # StarOffice 5.2
- shell/.sdw
-@@ -453,22 +496,27 @@ shell/.abw
+@@ -504,22 +519,27 @@ shell/.abw
  
  # Microsoft Word Document
  regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
 -	Open=(abiword %f >/dev/null 2>&1 &)
-+	Open=(ooffice %f &)
++	Open=(xdg-open %f &)
 +#	Open=(abiword %f >/dev/null 2>&1 &)
- 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
  type/^Microsoft\ Word
 -	Open=(abiword %f >/dev/null 2>&1 &)
-+	Open=(ooffice %f &)
++	Open=(xdg-open %f &)
 +#	Open=(abiword %f >/dev/null 2>&1 &)
- 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
  
  # RTF document
  regex/\.([rR][tT][fF])$
 -	Open=(abiword %f >/dev/null 2>&1 &)
-+	Open=(ooffice %f &)
++	Open=(xdg-open %f &)
 +#	Open=(abiword %f >/dev/null 2>&1 &)
  
  # Microsoft Excel Worksheet
  regex/\.([xX][lL][sSwW])$
 -	Open=(gnumeric %f >/dev/null 2>&1 &)
-+	Open=(ooffice %f &)
++	Open=(xdg-open %f &)
 +#	Open=(gnumeric %f >/dev/null 2>&1 &)
  	View=%view{ascii} xls2csv %f || strings %f
  type/^Microsoft\ Excel
 -	Open=(gnumeric %f >/dev/null 2>&1 &)
-+	Open=(ooffice %f &)
++	Open=(xdg-open %f &)
 +#	Open=(gnumeric %f >/dev/null 2>&1 &)
  	View=%view{ascii} xls2csv %f || strings %f
  
  # Use OpenOffice.org to open any MS Office documents
-@@ -545,6 +593,11 @@ type/^compress
- 	Open=gzip -dc %f | %var{PAGER:more}
- 	View=%view{ascii} gzip -dc %f 2>/dev/null
- 
-+# lzma
-+regex/\.lzma$
-+	Open=lzma -dc %f | %var{PAGER:more}
-+	View=%view{ascii} lzma -dc %f 2>/dev/null
-+
- 
- ### Default ###
- 


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/mc.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- mc.spec	28 May 2009 08:29:05 -0000	1.140
+++ mc.spec	4 Jan 2010 12:10:54 -0000	1.141
@@ -1,38 +1,18 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
-Version:	4.6.2
-Release:	10%{?dist}
+Version:	4.7.0.1
+Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
-# tarball from http://www.midnight-commander.org/downloads/3
-Source0:	mc-%{version}.tar.gz
+# tarball created from git clone git://midnight-commander.org/git/mc.git
+Source0:	mc-%{version}.tar.lzma
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	glib2-devel e2fsprogs-devel slang-devel
-BuildRequires:	gettext cvs automake autoconf
-Requires:	dev >= 0:3.3-3
-
-# UTF-8 patch from http://www.midnight-commander.org/downloads/4
-Patch0:		mc-4.6.2-utf8.patch
-Patch1:		mc-extensions.patch
-Patch2:		mc-userhost.patch
-Patch3:		mc-64bit.patch
-Patch6:		mc-showfree.patch
-Patch7:		mc-cedit.patch
-Patch8:		mc-delcheck.patch
-Patch9:		mc-etcmc.patch
-Patch10:	mc-exit.patch
-Patch12:	mc-ipv6.patch
-Patch13:	mc-newlinedir.patch
-Patch15:	mc-prompt.patch
-Patch16:	mc-refresh.patch
-Patch18:	mc-lzma.patch
-Patch19:	mc-hintchk.patch
-Patch21:	mc-oldrpmtags.patch
-Patch22:	mc-shellcwd.patch
-Patch23:	mc-cedit-configurable-highlight.patch
-Patch24:	mc-edit-segv.patch
+BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
+Requires:	dev >= 3.3-3
+
+Patch0:		mc-extensions.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -43,124 +23,26 @@ specific files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .utf8
-%patch1 -p1 -b .extensions
-%patch2 -p1 -b .userhost
-%patch3 -p1 -b .64bit
-%patch6 -p1 -b .showfree
-%patch7 -p1 -b .cedit
-%patch8 -p1 -b .delcheck
-%patch9 -p1 -b .etcmc
-%patch10 -p1 -b .exit
-%patch12 -p1 -b .ipv6
-%patch13 -p1 -b .newlinedir
-%patch15 -p1 -b .prompt
-%patch16 -p1 -b .refresh
-%patch18 -p1 -b .lzmavfs
-%patch19 -p1 -b .hintchk
-%patch21 -p1 -b .oldrpmtags
-%patch22 -p1 -b .shellcwd
-%patch23 -p1 -b .cedit-configurable-highlight
-%patch24 -p1 -b .edit-segv
-
-# convert files in /lib to UTF-8
-pushd lib
-for i in mc.hint mc.hint.es mc.hint.it mc.hint.nl; do
-  iconv -f iso-8859-1 -t utf-8 < ${i} > ${i}.tmp
-  mv -f ${i}.tmp ${i}
-done
-
-for i in mc.hint.cs mc.hint.hu mc.hint.pl; do
-  iconv -f iso-8859-2 -t utf-8 < ${i} > ${i}.tmp
-  mv -f ${i}.tmp ${i}
-done
-
-for i in mc.hint.sr mc.menu.sr; do
-  iconv -f iso-8859-5 -t utf-8 < ${i} > ${i}.tmp
-  mv -f ${i}.tmp ${i}
-done
-
-iconv -f koi8-r -t utf8 < mc.hint.ru > mc.hint.ru.tmp
-mv -f mc.hint.ru.tmp mc.hint.ru
-iconv -f koi8-u -t utf8 < mc.hint.uk > mc.hint.uk.tmp
-mv -f mc.hint.uk.tmp mc.hint.uk
-iconv -f big5 -t utf8 < mc.hint.zh > mc.hint.zh.tmp
-mv -f mc.hint.zh.tmp mc.hint.zh
-popd
-
-
-# convert man pages in /doc to UTF-8
-pushd doc
-
-pushd ru
-for i in mc.1.in xnc.hlp; do
-  iconv -f koi8-r -t utf-8 < ${i} > ${i}.tmp
-  mv -f ${i}.tmp ${i}
-done
-popd
-
-pushd sr
-for i in mc.1.in mcserv.8.in xnc.hlp; do
-  iconv -f iso-8859-5 -t utf-8 < ${i} > ${i}.tmp
-  mv -f ${i}.tmp ${i}
-done
-popd
-
-for d in es it; do
-  for i in mc.1.in xnc.hlp; do
-    iconv -f iso-8859-3 -t utf-8 < ${d}/${i} > ${d}/${i}.tmp
-    mv -f ${d}/${i}.tmp ${d}/${i}
-  done
-done
-
-for d in hu pl; do
-  for i in mc.1.in xnc.hlp; do
-    iconv -f iso-8859-2 -t utf-8 < ${d}/${i} > ${d}/${i}.tmp
-    mv -f ${d}/${i}.tmp ${d}/${i}
-  done
-done
-
-popd
+%patch0 -p1 -b .extensions
 
 %build
-./autogen.sh
-export CFLAGS="-DUTF8=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -fgnu89-inline"
-%configure --with-screen=slang \
-	     --enable-charset \
-	     --with-samba \
-	     --without-x \
-	     --with-gpm-mouse
+export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
+%configure	--with-screen=slang \
+		--enable-charset \
+		--with-samba \
+		--without-x \
+		--with-gpm-mouse \
+		--disable-rpath \
+		--enable-vfs-mcfs
 make %{?_smp_mflags}
 
-%install 
+%install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
 
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-
-# move configuration files to /etc/mc to make it FHS compliant (#2188)
-mv -f $RPM_BUILD_ROOT%{_datadir}/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,\
-mc.ext,mc.lib,mc.menu,mc.charsets} $RPM_BUILD_ROOT%{_sysconfdir}/mc
-mv -f $RPM_BUILD_ROOT%{_datadir}/mc/extfs/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
-mv -f $RPM_BUILD_ROOT%{_datadir}/mc/syntax/Syntax $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
-
-# install man pages in various languages
-for l in es hu it pl ru sr; do
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/${l}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/${l}/man1
-install -m 644 doc/${l}/mc.1 $RPM_BUILD_ROOT%{_mandir}/${l}/man1
-done
-
-for I in /etc/pam.d/mcserv \
-	/etc/rc.d/init.d/mcserv \
-	/etc/mc.global; do
-	rm -rf ${RPM_BUILD_ROOT}${I}
-done
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 %find_lang %{name}
 
@@ -169,14 +51,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-
-%doc FAQ COPYING NEWS README
+%doc doc/FAQ doc/COPYING doc/NEWS doc/README
 %{_bindir}/mc
 %{_bindir}/mcedit
 %{_bindir}/mcmfmt
 %{_bindir}/mcview
 %{_datadir}/mc/*
 %attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver
+%{_libexecdir}/mc/mc*
 %{_mandir}/man1/*
 %lang(es) %{_mandir}/es/man1/mc.1*
 %lang(hu) %{_mandir}/hu/man1/mc.1*
@@ -185,21 +67,25 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/mc.1*
 %lang(sr) %{_mandir}/sr/man1/mc.1*
 %{_sysconfdir}/profile.d/*
-%config %{_sysconfdir}/mc/syntax/Syntax
+%config %{_sysconfdir}/mc/Syntax
 %config %{_sysconfdir}/mc/mc.charsets
 %config %{_sysconfdir}/mc/mc.lib
-%config(noreplace) %{_sysconfdir}/mc/*edit*
 %config(noreplace) %{_sysconfdir}/mc/mc.ext
-%config(noreplace) %{_sysconfdir}/mc/mc.menu
-%config(noreplace) %{_sysconfdir}/mc/extfs/extfs.ini
-%config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
+%config(noreplace) %{_sysconfdir}/mc/*edit*
+%config(noreplace) %{_sysconfdir}/mc/mc.keymap*
+%config(noreplace) %{_sysconfdir}/mc/mc.menu*
+%config(noreplace) %{_sysconfdir}/mc/*.ini
+%config(noreplace) %{_sysconfdir}/mc/extfs/*.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
-%dir %{_sysconfdir}/mc/syntax
 %dir %{_sysconfdir}/mc/extfs
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Jan  4 2010 Jindrich Novy <jnovy at redhat.com> 4.7.0.1
+- update to 4.7.0.1
+- update bindings to use xdg-open wherever possible
+
 * Wed May 17 2009 Jindrich Novy <jnovy at redhat.com> 4.6.2-10
 - update to mc-4.6.2 release
 - fix segfault in mc editor when pressing ctrl+right (skip one word)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	28 May 2009 08:29:05 -0000	1.45
+++ sources	4 Jan 2010 12:10:54 -0000	1.46
@@ -1 +1 @@
-ec92966f4d0c8b50c344fe901859ae2a  mc-4.6.2.tar.gz
+4fec587435388701fd137bbe99ec77cd  mc-4.7.0.1.tar.lzma


--- mc-4.6.2-utf8.patch DELETED ---


--- mc-64bit.patch DELETED ---


--- mc-cedit-configurable-highlight.patch DELETED ---


--- mc-cedit.patch DELETED ---


--- mc-delcheck.patch DELETED ---


--- mc-edit-segv.patch DELETED ---


--- mc-etcmc.patch DELETED ---


--- mc-exit.patch DELETED ---


--- mc-hintchk.patch DELETED ---


--- mc-ipv6.patch DELETED ---


--- mc-lzma.patch DELETED ---


--- mc-ministatus.patch DELETED ---


--- mc-newlinedir.patch DELETED ---


--- mc-oldrpmtags.patch DELETED ---


--- mc-prompt.patch DELETED ---


--- mc-refresh.patch DELETED ---


--- mc-shellcwd.patch DELETED ---


--- mc-showfree.patch DELETED ---


--- mc-spaceprompt.patch DELETED ---


--- mc-userhost.patch DELETED ---


