up to 4.8.31

diff --git a/ebook-ext.patch b/ebook-ext.patch
index a34976e9563250fe632a0e5920b702899cfe908a..978b5d87398838717ca77326bb8995f997c6ad84 100644 (file)
--- a/ebook-ext.patch
+++ b/ebook-ext.patch
@@ -4,8 +4,8 @@
  
  # Epup, mobi, fb2
  [ebook]
--Regex=\.(epub|mobi|fb2)$
-+Regex=\.(epub|mobi|lrf|lrs|azw[123]?|pobi|lit|fb2)$
+-Regex=\\.(epub|mobi|fb2)$
++Regex=\\.(epub|mobi|lrf|lrs|azw[123]?|pobi|lit|fb2)$
  RegexIgnoreCase=true
  Open=@EXTHELPERSDIR@/doc.sh open ebook
  View=%view{ascii} @EXTHELPERSDIR@/doc.sh view ebook

diff --git a/mc.spec b/mc.spec
index fdaea64e8cfaa13686d1f4a448730ca8f37ceb00..524b6dbdd1e844e97cc83a1c583ecfd81e1fb935 100644 (file)
--- a/mc.spec
+++ b/mc.spec
@@ -17,13 +17,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.30
+Version:       4.8.31
 Release:       1
 Epoch:         1
 License:       GPL v3+
 Group:         Applications/Shells
 Source0:       http://ftp.midnight-commander.org/%{name}-%{version}.tar.xz
-# Source0-md5: 96fcd04710b7848fedea8597da4bd7da
+# Source0-md5: 2c3dd9af66e4cfef5a7a460df1cdf868
 Source3:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19
 Source7:       %{name}.desktop
@@ -171,8 +171,8 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir.
 
 %{__sed} -i 's:|hxx|:|hxx|tcc|:' misc/syntax/Syntax.in
 
-sed -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' \
-      src/vfs/extfs/helpers/uc1541
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+       src/vfs/extfs/helpers/uc1541
 
 %build
 %{__gettextize}
@@ -343,9 +343,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/mc/extfs.d/urar
 %attr(755,root,root) %{_libexecdir}/mc/extfs.d/uwim
 %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]*
+%dir %{_libexecdir}/mc/shell
+%{_libexecdir}/mc/shell/README.shell
+%attr(755,root,root) %{_libexecdir}/mc/shell/[a-z]*
 %{_desktopdir}/mc.desktop
 %{_pixmapsdir}/mc.png