- upgraded to 4.7.5

Changed files:
    mc-down2.diff -> 1.2
    mc.spec -> 1.327
    slang-8bit_xterm.patch -> 1.4

diff --git a/mc-down2.diff b/mc-down2.diff
deleted file mode 100644 (file)
index 209d1c5..0000000
--- a/mc-down2.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur -ruNp mc-4.7.2.orig/src/viewer/move.c mc-4.7.2/src/viewer/move.c
---- mc-4.7.2.orig/src/viewer/move.c    2010-05-06 14:06:38.000000000 +0200
-+++ mc-4.7.2/src/viewer/move.c 2010-05-09 18:54:15.000000000 +0200
-@@ -154,35 +154,33 @@ mcview_move_down (mcview_t * view, off_t
-     else
-     {
-         off_t i;
--        off_t new_offset = 0;
-+        off_t new_offset;
- 
-         if (view->dpy_end - view->dpy_start > last_byte - view->dpy_end)
-         {
--            i = 0;
--            new_offset = view->dpy_end;
--            while (view->dpy_end < last_byte && lines-- > 0)
-+            while (lines-- > 0)
-             {
-                 new_offset = mcview_eol (view, view->dpy_end);
-                 if (view->text_wrap_mode)
-                     new_offset = min (new_offset, view->dpy_end + view->data_area.width);
-                 view->dpy_end = new_offset;
-+                if(view->dpy_end>=last_byte) lines=0;
- 
-                 new_offset = mcview_eol (view, view->dpy_start);
-                 if (view->text_wrap_mode)
-                     new_offset = min (new_offset, view->dpy_start + view->data_area.width);
--                view->dpy_start = new_offset;
-+                if(new_offset<last_byte) view->dpy_start = new_offset;
-             }
--            view->dpy_end = last_byte;
-         }
-         else
-         {
- 
--            for (i = 0; i < lines && view->dpy_end < last_byte && new_offset < last_byte; i++)
-+            for (i = 0; i < lines && new_offset < last_byte; i++)
-             {
-                 new_offset = mcview_eol (view, view->dpy_start);
-                 if (view->text_wrap_mode)
-                     new_offset = min (new_offset, view->dpy_start + view->data_area.width);
--                view->dpy_start = new_offset;
-+                if(new_offset<last_byte) view->dpy_start = new_offset;
-             }
-         }
-     }

diff --git a/mc.spec b/mc.spec
index 53476ae168544cafa1affe611fb1a21c8f8d41c5..3a91e602c9e1c26087ff69c8bef84828fa075810 100644 (file)
--- a/mc.spec
+++ b/mc.spec
@@ -20,20 +20,19 @@ Summary(tr.UTF-8):  Midnight Commander görsel kabuğu
 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
@@ -165,7 +164,6 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir.
 #rpm wrapper rewritten
 #%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 # doesn't apply
 #%patch4 -p1
 # doesn't apply
@@ -190,13 +188,11 @@ sed -i 's:|hxx|:|hh|hpp|hxx|tcc|:' misc/syntax/Syntax
 
 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
 
@@ -225,8 +221,6 @@ done
 
 install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/shrc.d
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/be@tarask
-
 %find_lang %{name}
 
 %clean
@@ -235,35 +229,38 @@ rm -rf $RPM_BUILD_ROOT
 %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*
@@ -310,5 +307,4 @@ rm -rf $RPM_BUILD_ROOT
 %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/*.*

diff --git a/slang-8bit_xterm.patch b/slang-8bit_xterm.patch
index b07131000c09552a8c3fda4d909552f158f636e1..674708de8e11f2c2fc793cf55c4dd1e12bcc052a 100644 (file)
--- a/slang-8bit_xterm.patch
+++ b/slang-8bit_xterm.patch
@@ -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)