packages: mc/mc.spec, mc/slang-8bit_xterm.patch, mc/mc-down2.diff (REMOVED)...

Wed Dec 29 01:08:41 CET 2010

Author: gotar                        Date: Wed Dec 29 00:08:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 4.7.5

---- Files affected:
packages/mc:
   mc.spec (1.326 -> 1.327) , slang-8bit_xterm.patch (1.3 -> 1.4) , mc-down2.diff (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.326 packages/mc/mc.spec:1.327

--- packages/mc/mc.spec:1.326	Tue Sep 21 11:16:53 2010
+++ packages/mc/mc.spec	Wed Dec 29 01:08:36 2010
@@ -21,20 +21,19 @@
 Summary(uk.UTF-8):	Диспетчер файлів Midnight Commander
 Summary(zh_CN.UTF-8):	一个方便实用的文件管理器和虚拟Shell
 Name:		mc
-Version:	4.7.4
-Release:	2.1
+Version:	4.7.5
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Shells
 Source0:	http://www.midnight-commander.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	ae07f873b91e8a2e4a3b081f1adedd2e
+# Source0-md5:	4eb2438b168fb0f93b748889a9294f54
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	17d7b574e1b85ad6f8ddceda9e841f19
 Source7:	%{name}.desktop
 Source8:	%{name}.png
 Patch0:		%{name}-rpmfs.patch
 Patch1:		slang-8bit_xterm.patch
-Patch2:		%{name}-down2.diff
 Patch4:		%{name}-home_etc2.patch
 Patch5:		%{name}-pl.patch
 Patch6:		%{name}-no-ws-visible.patch
@@ -166,7 +165,6 @@
 #rpm wrapper rewritten
 #%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 # doesn't apply
 #%patch4 -p1
 # doesn't apply
@@ -191,13 +189,11 @@
 
 export X11_WWW="xdg-open"
 %configure \
-	--with%{!?debug:out}-debug \
-	--with%{!?with_ext2undel:out}-ext2undel \
+	%{?with_ext2undel:--enable-vfs-undelfs} \
+	%{?with_samba:--enable-vfs-smb} \
+	--with-smb-configdir=/etc/samba \
+	--with-smb-codepagedir=/etc/samba/codepages \
 	--with%{!?with_x:out}-x \
-	--with-vfs \
-	%{?with_samba:--with-samba} \
-	--with-configdir=/etc/samba \
-	--with-codepagedir=/etc/samba/codepages \
 	--with-gpm-mouse \
 	--with-screen=slang
 
@@ -226,8 +222,6 @@
 
 install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/shrc.d
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/be at tarask
-
 %find_lang %{name}
 
 %clean
@@ -236,35 +230,38 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc NEWS README
-%attr(755,root,root) %{_bindir}/mc*
 %config /etc/shrc.d/*
-%attr(755,root,root) %{_libdir}/mc/cons.saver
+%attr(755,root,root) %{_bindir}/mc*
 %dir %{_libdir}/mc
+%attr(755,root,root) %{_libdir}/mc/cons.saver
 %attr(755,root,root) %{_libdir}/mc/*.sh
 %attr(755,root,root) %{_libdir}/mc/*.csh
 %dir %{_datadir}/mc
 
+%{_datadir}/mc/mc.*
 %{_datadir}/mc/skins
 %{_datadir}/mc/syntax
 
-%{_datadir}/mc/mc.hlp
-%lang(es) %{_datadir}/mc/mc.hlp.es
-%lang(hu) %{_datadir}/mc/mc.hlp.hu
-%lang(it) %{_datadir}/mc/mc.hlp.it
-%lang(pl) %{_datadir}/mc/mc.hlp.pl
-%lang(ru) %{_datadir}/mc/mc.hlp.ru
-%lang(sr) %{_datadir}/mc/mc.hlp.sr
-%{_datadir}/mc/mc.hint
-%lang(cs) %{_datadir}/mc/mc.hint.cs
-%lang(es) %{_datadir}/mc/mc.hint.es
-%lang(hu) %{_datadir}/mc/mc.hint.hu
-%lang(it) %{_datadir}/mc/mc.hint.it
-%lang(nl) %{_datadir}/mc/mc.hint.nl
-%lang(pl) %{_datadir}/mc/mc.hint.pl
-%lang(ru) %{_datadir}/mc/mc.hint.ru
-%lang(sr) %{_datadir}/mc/mc.hint.sr
-%lang(uk) %{_datadir}/mc/mc.hint.uk
-%lang(zh) %{_datadir}/mc/mc.hint.zh
+%dir %{_datadir}/mc/help
+%{_datadir}/mc/help/mc.hlp
+%lang(es) %{_datadir}/mc/help/mc.hlp.es
+%lang(hu) %{_datadir}/mc/help/mc.hlp.hu
+%lang(it) %{_datadir}/mc/help/mc.hlp.it
+%lang(pl) %{_datadir}/mc/help/mc.hlp.pl
+%lang(ru) %{_datadir}/mc/help/mc.hlp.ru
+%lang(sr) %{_datadir}/mc/help/mc.hlp.sr
+%dir %{_datadir}/mc/hints
+%{_datadir}/mc/hints/mc.hint
+%lang(cs) %{_datadir}/mc/hints/mc.hint.cs
+%lang(es) %{_datadir}/mc/hints/mc.hint.es
+%lang(hu) %{_datadir}/mc/hints/mc.hint.hu
+%lang(it) %{_datadir}/mc/hints/mc.hint.it
+%lang(nl) %{_datadir}/mc/hints/mc.hint.nl
+%lang(pl) %{_datadir}/mc/hints/mc.hint.pl
+%lang(ru) %{_datadir}/mc/hints/mc.hint.ru
+%lang(sr) %{_datadir}/mc/hints/mc.hint.sr
+%lang(uk) %{_datadir}/mc/hints/mc.hint.uk
+%lang(zh) %{_datadir}/mc/hints/mc.hint.zh
 
 %dir %{_libdir}/mc/extfs.d
 %{_libdir}/mc/extfs.d/README*
@@ -311,7 +308,6 @@
 %lang(sr) %{_mandir}/sr/man1/*
 
 %dir %{_sysconfdir}/mc
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mc/Syntax
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mc/*.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -320,6 +316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.327  2010/12/29 00:08:36  gotar
+- upgraded to 4.7.5
+
 Revision 1.326  2010/09/21 09:16:53  baggins
 - rel 2.1
 - broken wildchar handling in copy/rename dialogs

================================================================
Index: packages/mc/slang-8bit_xterm.patch
diff -u packages/mc/slang-8bit_xterm.patch:1.3 packages/mc/slang-8bit_xterm.patch:1.4
--- packages/mc/slang-8bit_xterm.patch:1.3	Thu May  6 10:15:50 2010
+++ packages/mc/slang-8bit_xterm.patch	Wed Dec 29 01:08:36 2010
@@ -1,13 +1,12 @@
-diff -urNp mc-4.7.0-pre4.orig/src/main.c mc-4.7.0-pre4/src/main.c
---- mc-4.7.2.orig/src/main.c	2010-05-05 20:30:03.000000000 +0200
-+++ mc-4.7.2/src/main.c	2010-05-06 10:05:13.000000000 +0200
-@@ -1470,6 +1470,9 @@ init_xterm_support (void)
+--- mc-4.7.5/src/filemanager/midnight.c.orig	2010-12-28 10:30:45.000000000 +0100
++++ mc-4.7.5/src/filemanager/midnight.c	2010-12-29 00:10:55.000000000 +0100
+@@ -750,6 +750,9 @@ init_xterm_support (void)
          || strcmp (termvalue, "Eterm") == 0 || strcmp (termvalue, "dtterm") == 0)
      {
          xterm_flag = 1;
 +#ifdef HAVE_SLANG
 +	tty_display_8bit (0);
-+#endif
++#endif  
  
          /* Default to the standard xterm sequence */
          if (!xmouse_seq)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.326&r2=1.327&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/slang-8bit_xterm.patch?r1=1.3&r2=1.4&f=u

