- update to new CVS snapshot (fixes #220828)

- update bindings again
2007-01-04 16:14:38 +00:00 · 2007-01-04 16:14:38 +00:00 · f31b9729cd
commit f31b9729cd
parent 17e2a6ed68
5 changed files with 220 additions and 198 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -5,3 +5,4 @@ mc-2006-09-12-21.tar.gz
 mc-2006-09-25-14.tar.gz
 mc-2006-10-15-16.tar.gz
 mc-2006-11-14-16.tar.gz
+mc-2006-12-28-05.tar.gz
--- a/mc-extensions.patch
+++ b/mc-extensions.patch
@ -1,5 +1,5 @@
--- mc-2006-11-14-16/configure.ac.extensions	2006-11-14 17:05:09.000000000 +0100
-+++ mc-2006-11-14-16/configure.ac	2006-12-04 12:53:03.000000000 +0100
+--- mc/configure.ac.extensions	2006-12-28 06:34:31.000000000 +0100
+++ mc/configure.ac	2007-01-04 15:42:15.000000000 +0100
@@ -83,7 +83,7 @@
 AC_CHECK_TOOL(AR, ar, ar)
 
@ -9,9 +9,9 @@
 
 dnl
 dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
--- mc-2006-11-14-16/configure.extensions	2006-11-14 17:05:25.000000000 +0100
-+++ mc-2006-11-14-16/configure	2006-12-04 12:53:03.000000000 +0100
-@@ -5767,7 +5767,7 @@
+--- mc/configure.extensions	2006-12-28 06:34:48.000000000 +0100
+++ mc/configure	2007-01-04 15:42:15.000000000 +0100
+@@ -7166,7 +7166,7 @@
 fi
 
 
@ -20,8 +20,8 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
--- mc-2006-11-14-16/lib/mc.ext.in.extensions	2006-06-22 15:40:51.000000000 +0200
-+++ mc-2006-11-14-16/lib/mc.ext.in	2006-12-04 13:07:36.000000000 +0100
+--- mc/lib/mc.ext.in.extensions	2006-12-28 04:45:29.000000000 +0100
+++ mc/lib/mc.ext.in	2007-01-04 15:53:33.000000000 +0100
@@ -220,14 +220,25 @@
 
 # C
@ -65,7 +65,7 @@
 
 # Manual page
 # Exception - .so libraries are not manual pages
-@@ -328,18 +342,24 @@
+@@ -328,18 +341,24 @@
 type/^Netpbm
 	Include=image
 
@ -92,22 +92,37 @@
 	View=%view{ascii} identify %f
 	#View=%view{ascii} asciiview %f
 
-@@ -357,8 +377,12 @@
+@@ -347,7 +366,8 @@
+ ### 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
+#       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 +377,16 @@
        Open=vplay -s 22 %f
 
 regex/\.([mM][pP]3)$
-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
+-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
 -	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
 +	Include=audio
-+	#Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
-+	#View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
 +
 +regex/\.([mM][kK][aA])$
 +	Include=audio
 
 regex/\.([oO][gG][gG])$
- 	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
-@@ -371,6 +395,9 @@
+-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+	Open=ogg123 %f
+#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 	View=%view{ascii} ogginfo %s
+ 
+ regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
+@@ -371,11 +396,15 @@
 	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
 
@ -117,7 +132,14 @@
 
 ### Play lists ###
 
-@@ -395,20 +422,27 @@
+ regex/\.([mM]3[uU]|[pP][lL][sS])$
+-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+	Open=mplayer -vo null -playlist %f
+#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+ 
+ 
+ ### Video ###
+@@ -395,20 +424,27 @@
 regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
 	Include=video
 
@ -146,7 +168,7 @@
 	#Open=(gtv %f >/dev/null 2>&1 &)
 	#Open=(xanim %f >/dev/null 2>&1 &)
 
-@@ -417,12 +451,13 @@
+@@ -417,12 +453,13 @@
 
 # Postscript
 type/^PostScript
@ -162,7 +184,7 @@
 	#Open=(acroread %f &)
 	#Open=(ghostview %f &)
 	View=%view{ascii} pdftotext %f -
-@@ -433,7 +468,7 @@
+@@ -433,7 +470,7 @@
 # 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
@ -171,7 +193,7 @@
 
 # StarOffice 5.2
 shell/.sdw
-@@ -450,22 +485,27 @@
+@@ -450,22 +487,27 @@
 
 # Microsoft Word Document
 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
--- a/mc-utf8.patch
+++ b/mc-utf8.patch
--- a/mc.spec
+++ b/mc.spec
@ -1,9 +1,9 @@
-%define date 2006-11-14-16
+%define date 2006-12-28-05

 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	38%{?dist}
+Release:	39%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@ -200,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/mc

 %changelog
+* Thu Jan  4 2007 Jindrich Novy <jnovy@redhat.com> 4.6.1a-39
+- update to new CVS snapshot (fixes #220828)
+- update bindings again
+
 * Thu Dec 21 2006 Jindrich Novy <jnovy@redhat.com> 4.6.1a-38
 - rebuild because of the %%{_host} macro change (Related: #220273)

--- a/2
+++ b/2
@ -1 +1 @@
-bd4f2e1c98a283ce7634365c9d4567f0  mc-2006-11-14-16.tar.gz
+36677cf9331e463c98109ea7fa7f5c47  mc-2006-12-28-05.tar.gz