From 5c49238db8281aa9178aa6cf12ec6c5393c79393 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 9 Apr 2018 12:38:39 +0000 Subject: [PATCH] - merged 4.8.20 from PLD --- mc-confirm-exit.patch | 16 ++-- mc-file-find-case-insensitive.patch | 6 +- mc-no-compute-totals.patch | 14 +-- mc-no-ws-visible.patch | 16 ++-- mc-pld-developerfriendly.patch | 10 +- mc.spec | 136 ++++++++++++++-------------- 6 files changed, 99 insertions(+), 99 deletions(-) diff --git a/mc-confirm-exit.patch b/mc-confirm-exit.patch index 49f96ff..3624baa 100644 --- a/mc-confirm-exit.patch +++ b/mc-confirm-exit.patch @@ -1,12 +1,12 @@ -diff -urNp mc-4.8.18.orig/src/setup.c mc-4.8.18/src/setup.c ---- mc-4.8.18.orig/src/setup.c 2017-02-09 07:50:42.739638780 +0000 -+++ mc-4.8.18/src/setup.c 2017-02-09 07:52:18.827637698 +0000 -@@ -100,7 +100,7 @@ int confirm_overwrite = 1; +diff -urpa mc-4.8.20.orig/src/setup.c mc-4.8.20/src/setup.c +--- mc-4.8.20.orig/src/setup.c 2018-04-09 12:33:43.452504866 +0000 ++++ mc-4.8.20/src/setup.c 2018-04-09 12:34:41.690504210 +0000 +@@ -100,7 +100,7 @@ gboolean confirm_overwrite = TRUE; /* Asks for confirmation before executing a program by pressing enter */ - int confirm_execute = 0; + gboolean confirm_execute = FALSE; /* Asks for confirmation before leaving the program */ --int confirm_exit = 0; -+int confirm_exit = 1; +-gboolean confirm_exit = FALSE; ++gboolean confirm_exit = TRUE; /* If true, at startup the user-menu is invoked */ - int auto_menu = 0; + gboolean auto_menu = FALSE; diff --git a/mc-file-find-case-insensitive.patch b/mc-file-find-case-insensitive.patch index 2480b1b..ae72651 100644 --- a/mc-file-find-case-insensitive.patch +++ b/mc-file-find-case-insensitive.patch @@ -1,6 +1,6 @@ -diff -urNp mc-4.8.18.orig/src/filemanager/find.c mc-4.8.18/src/filemanager/find.c ---- mc-4.8.18.orig/src/filemanager/find.c 2017-02-09 07:49:15.633639761 +0000 -+++ mc-4.8.18/src/filemanager/find.c 2017-02-09 07:50:19.801639038 +0000 +diff -urpa mc-4.8.20.orig/src/filemanager/find.c mc-4.8.20/src/filemanager/find.c +--- mc-4.8.20.orig/src/filemanager/find.c 2018-04-09 12:32:24.759505752 +0000 ++++ mc-4.8.20/src/filemanager/find.c 2018-04-09 12:32:53.728505426 +0000 @@ -284,7 +284,7 @@ find_load_options (void) loaded = TRUE; diff --git a/mc-no-compute-totals.patch b/mc-no-compute-totals.patch index aee9a4a..b4627de 100644 --- a/mc-no-compute-totals.patch +++ b/mc-no-compute-totals.patch @@ -1,12 +1,12 @@ -diff -urNp mc-4.8.18.orig/src/setup.c mc-4.8.18/src/setup.c ---- mc-4.8.18.orig/src/setup.c 2017-02-09 07:48:30.365640270 +0000 -+++ mc-4.8.18/src/setup.c 2017-02-09 07:48:45.664640098 +0000 -@@ -174,7 +174,7 @@ int verbose = 1; +diff -urpa mc-4.8.20.orig/src/setup.c mc-4.8.20/src/setup.c +--- mc-4.8.20.orig/src/setup.c 2018-04-09 12:31:05.331506646 +0000 ++++ mc-4.8.20/src/setup.c 2018-04-09 12:31:42.760506225 +0000 +@@ -174,7 +174,7 @@ gboolean verbose = TRUE; * information about copy/move sizes and bytes transferred * at the expense of some speed */ --int file_op_compute_totals = 1; -+int file_op_compute_totals = 0; +-gboolean file_op_compute_totals = TRUE; ++gboolean file_op_compute_totals = FALSE; /* If true use the internal viewer */ - int use_internal_view = 1; + gboolean use_internal_view = TRUE; diff --git a/mc-no-ws-visible.patch b/mc-no-ws-visible.patch index bea53bd..2e115dd 100644 --- a/mc-no-ws-visible.patch +++ b/mc-no-ws-visible.patch @@ -1,12 +1,14 @@ -diff -urNp mc-4.8.18.orig/src/editor/editdraw.c mc-4.8.18/src/editor/editdraw.c ---- mc-4.8.18.orig/src/editor/editdraw.c 2016-05-07 15:42:52.000000000 +0000 -+++ mc-4.8.18/src/editor/editdraw.c 2017-02-09 07:46:34.507641575 +0000 -@@ -63,7 +63,7 @@ +diff -urpa mc-4.8.20.orig/src/editor/editdraw.c mc-4.8.20/src/editor/editdraw.c +--- mc-4.8.20.orig/src/editor/editdraw.c 2017-03-04 17:51:38.000000000 +0000 ++++ mc-4.8.20/src/editor/editdraw.c 2018-04-09 12:30:00.046507381 +0000 +@@ -63,8 +63,8 @@ /* Toggles statusbar draw style */ - int simple_statusbar = 0; + gboolean simple_statusbar = FALSE; --int visible_tabs = 1, visible_tws = 1; -+int visible_tabs = 0, visible_tws = 0; +-gboolean visible_tws = TRUE; +-gboolean visible_tabs = TRUE; ++gboolean visible_tws = FALSE; ++gboolean visible_tabs = FALSE; /*** file scope macro definitions ****************************************************************/ diff --git a/mc-pld-developerfriendly.patch b/mc-pld-developerfriendly.patch index 5f338b9..a55e135 100644 --- a/mc-pld-developerfriendly.patch +++ b/mc-pld-developerfriendly.patch @@ -22,18 +22,16 @@ diff -urN mc-2006-02-24-22.org/syntax/cvs-userlist.syntax mc-2006-02-24-22/synta + keyword , yellow black + + -diff -urN mc-2006-02-24-22.org/syntax/Makefile.am mc-2006-02-24-22/syntax/Makefile.am ---- mc-2006-02-24-22.org/misc/syntax/Makefile.am 2006-01-30 18:01:58.000000000 +0100 -+++ mc-2006-02-24-22/misc/syntax/Makefile.am 2006-02-28 17:38:02.617073750 +0100 -@@ -11,7 +11,8 @@ - debian-sources-list.syntax \ +--- mc-4.8.19/misc/syntax/Makefile.am.orig 2017-03-11 18:30:38.998587163 +0100 ++++ mc-4.8.19/misc/syntax/Makefile.am 2017-03-11 18:34:17.005281053 +0100 +@@ -16,6 +16,7 @@ cs.syntax \ css.syntax \ cuda.syntax \ + cvs-userlist.syntax \ cxx.syntax \ + cython.syntax \ d.syntax \ - diff.syntax \ @@ -35,6 +36,7 @@ pascal.syntax \ perl.syntax \ diff --git a/mc.spec b/mc.spec index d8b7834..f197a86 100644 --- a/mc.spec +++ b/mc.spec @@ -18,13 +18,13 @@ 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.8.18 +Version: 4.8.20 Release: 1 Epoch: 1 License: GPL v3+ Group: Applications/Shells Source0: http://ftp.midnight-commander.org/%{name}-%{version}.tar.xz -# Source0-md5: 85ff9279f912c5482fe9f110f8892c96 +# Source0-md5: 7f808b01f3f7d9aa52152a9efb86dbca Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19 Source7: %{name}.desktop @@ -45,6 +45,7 @@ BuildRequires: glib2-devel >= 2.8 %ifnarch s390 s390x BuildRequires: gpm-devel %endif +BuildRequires: libssh2-devel >= 1.2.5 BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pcre-devel @@ -168,7 +169,7 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir. %{__rm} po/stamp-po -%{__sed} -i 's:|hxx|:|hh|hpp|hxx|tcc|:' misc/syntax/Syntax.in +%{__sed} -i 's:|hxx|:|hxx|tcc|:' misc/syntax/Syntax.in %build %{__gettextize} @@ -230,19 +231,23 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc NEWS README doc/keybind-migration.txt +%doc NEWS README %config /etc/shrc.d/* %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 %{_libexecdir}/mc +%attr(755,root,root) %{_libexecdir}/mc/cons.saver +%attr(755,root,root) %{_libexecdir}/mc/*.sh +%attr(755,root,root) %{_libexecdir}/mc/*.csh %dir %{_datadir}/mc %{_datadir}/mc/mc.* %{_datadir}/mc/skins %{_datadir}/mc/syntax +%dir %{_datadir}/mc/examples +%dir %{_datadir}/mc/examples/macros.d +%{_datadir}/mc/examples/macros.d/* + %dir %{_datadir}/mc/help %{_datadir}/mc/help/mc.hlp %lang(es) %{_datadir}/mc/help/mc.hlp.es @@ -253,16 +258,16 @@ rm -rf $RPM_BUILD_ROOT %lang(sr) %{_datadir}/mc/help/mc.hlp.sr %dir %{_datadir}/mc/hints %{_datadir}/mc/hints/mc.hint -# only English messages inside (as for 4.8.13) +# disabled hint files contain only English messages (as for 4.8.18) +#%lang(af) %{_datadir}/mc/hints/mc.hint.af +#%lang(ar) %{_datadir}/mc/hints/mc.hint.ar #%lang(az) %{_datadir}/mc/hints/mc.hint.az %lang(be) %{_datadir}/mc/hints/mc.hint.be -# only English messages inside (as for 4.8.13) -#%lang(bg) %{_datadir}/mc/hints/mc.hint.bg +%lang(bg) %{_datadir}/mc/hints/mc.hint.bg #%lang(ca) %{_datadir}/mc/hints/mc.hint.ca %lang(cs) %{_datadir}/mc/hints/mc.hint.cs -# only English messages inside (as for 4.8.13) #%lang(da) %{_datadir}/mc/hints/mc.hint.da -#%lang(de) %{_datadir}/mc/hints/mc.hint.de +%lang(de) %{_datadir}/mc/hints/mc.hint.de #%lang(de_CH) %{_datadir}/mc/hints/mc.hint.de_CH %lang(el) %{_datadir}/mc/hints/mc.hint.el %lang(en_GB) %{_datadir}/mc/hints/mc.hint.en_GB @@ -271,20 +276,15 @@ rm -rf $RPM_BUILD_ROOT %lang(et) %{_datadir}/mc/hints/mc.hint.et %lang(eu) %{_datadir}/mc/hints/mc.hint.eu %lang(fa) %{_datadir}/mc/hints/mc.hint.fa -# only English messages inside (as for 4.8.13) #%lang(fi) %{_datadir}/mc/hints/mc.hint.fi %lang(fr) %{_datadir}/mc/hints/mc.hint.fr -# only English messages inside (as for 4.8.13) #%lang(fr_CA) %{_datadir}/mc/hints/mc.hint.fr_CA %lang(gl) %{_datadir}/mc/hints/mc.hint.gl -# only English messages inside (as for 4.8.12) #%lang(hr) %{_datadir}/mc/hints/mc.hint.hr %lang(hu) %{_datadir}/mc/hints/mc.hint.hu -# only English messages inside (as for 4.8.12) #%lang(ia) %{_datadir}/mc/hints/mc.hint.ia %lang(id) %{_datadir}/mc/hints/mc.hint.id %lang(it) %{_datadir}/mc/hints/mc.hint.it -# only English messages inside (as for 4.8.13) #%lang(ja) %{_datadir}/mc/hints/mc.hint.ja #%lang(ka) %{_datadir}/mc/hints/mc.hint.ka #%lang(kk) %{_datadir}/mc/hints/mc.hint.kk @@ -296,65 +296,65 @@ rm -rf $RPM_BUILD_ROOT %lang(pt_BR) %{_datadir}/mc/hints/mc.hint.pt_BR %lang(ro) %{_datadir}/mc/hints/mc.hint.ro %lang(ru) %{_datadir}/mc/hints/mc.hint.ru -# only English messages inside (as for 4.8.13) -#%lang(sk) %{_datadir}/mc/hints/mc.hint.sk +%lang(sk) %{_datadir}/mc/hints/mc.hint.sk #%lang(sl) %{_datadir}/mc/hints/mc.hint.sl -#%lang(sr) %{_datadir}/mc/hints/mc.hint.sr +%lang(sr) %{_datadir}/mc/hints/mc.hint.sr #%lang(sv) %{_datadir}/mc/hints/mc.hint.sv #%lang(szl) %{_datadir}/mc/hints/mc.hint.szl #%lang(te) %{_datadir}/mc/hints/mc.hint.te -#%lang(tr) %{_datadir}/mc/hints/mc.hint.tr +%lang(tr) %{_datadir}/mc/hints/mc.hint.tr %lang(uk) %{_datadir}/mc/hints/mc.hint.uk +#%lang(uz) %{_datadir}/mc/hints/mc.hint.uz %lang(zh_CN) %{_datadir}/mc/hints/mc.hint.zh_CN -%dir %{_libdir}/mc/ext.d -%attr(755,root,root) %{_libdir}/mc/ext.d/archive.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/doc.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/image.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/misc.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/package.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/sound.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/text.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/video.sh -%attr(755,root,root) %{_libdir}/mc/ext.d/web.sh - -%dir %{_libdir}/mc/extfs.d -%{_libdir}/mc/extfs.d/README* +%dir %{_libexecdir}/mc/ext.d +%attr(755,root,root) %{_libexecdir}/mc/ext.d/archive.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/doc.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/image.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/misc.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/package.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/sound.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/text.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/video.sh +%attr(755,root,root) %{_libexecdir}/mc/ext.d/web.sh + +%dir %{_libexecdir}/mc/extfs.d +%{_libexecdir}/mc/extfs.d/README* %if %{with perl_vfs} -%attr(755,root,root) %{_libdir}/mc/extfs.d/a+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/apt+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/deb* -%attr(755,root,root) %{_libdir}/mc/extfs.d/dpkg+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/mailfs -%attr(755,root,root) %{_libdir}/mc/extfs.d/patchfs -%attr(755,root,root) %{_libdir}/mc/extfs.d/rpms+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/ulib -%attr(755,root,root) %{_libdir}/mc/extfs.d/uzip +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/a+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/apt+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/deb* +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/dpkg+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/mailfs +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/patchfs +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/rpms+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/ulib +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uzip %endif -%attr(755,root,root) %{_libdir}/mc/extfs.d/audio -%attr(755,root,root) %{_libdir}/mc/extfs.d/bpp -%attr(755,root,root) %{_libdir}/mc/extfs.d/changesetfs -%attr(755,root,root) %{_libdir}/mc/extfs.d/gitfs+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/hp48+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/iso9660 -%attr(755,root,root) %{_libdir}/mc/extfs.d/lslR -%attr(755,root,root) %{_libdir}/mc/extfs.d/patchsetfs -%attr(755,root,root) %{_libdir}/mc/extfs.d/rpm -%attr(755,root,root) %{_libdir}/mc/extfs.d/s3+ -%attr(755,root,root) %{_libdir}/mc/extfs.d/trpm -%attr(755,root,root) %{_libdir}/mc/extfs.d/u7z -%attr(755,root,root) %{_libdir}/mc/extfs.d/uace -%attr(755,root,root) %{_libdir}/mc/extfs.d/ualz -%attr(755,root,root) %{_libdir}/mc/extfs.d/uar* -%attr(755,root,root) %{_libdir}/mc/extfs.d/uc1541 -%attr(755,root,root) %{_libdir}/mc/extfs.d/ucab -%attr(755,root,root) %{_libdir}/mc/extfs.d/uha -%attr(755,root,root) %{_libdir}/mc/extfs.d/ulha -%attr(755,root,root) %{_libdir}/mc/extfs.d/urar -%attr(755,root,root) %{_libdir}/mc/extfs.d/uzoo -%dir %{_libdir}/mc/fish -%{_libdir}/mc/fish/README.fish -%attr(755,root,root) %{_libdir}/mc/fish/[a-z]* +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/audio +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/bpp +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/changesetfs +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/gitfs+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/hp48+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/iso9660 +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/lslR +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/patchsetfs +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/rpm +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/s3+ +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/trpm +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/u7z +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uace +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/ualz +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uar* +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uc1541 +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/ucab +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uha +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/ulha +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/urar +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uzoo +%dir %{_libexecdir}/mc/fish +%{_libexecdir}/mc/fish/README.fish +%attr(755,root,root) %{_libexecdir}/mc/fish/[a-z]* %{_desktopdir}/mc.desktop %{_pixmapsdir}/mc.png -- 2.44.0