- merged 4.8.26 from PLD, dropped python2

[packages/mc.git] / mc.spec

diff --git a/mc.spec b/mc.spec
index 1f1732918a95ece366276566c38859dbff94e05d..663a557410fadff15fad1c10d688b91f9a227fab 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.25
+Version:       4.8.26
 Release:       1
 Epoch:         1
 License:       GPL v3+
 Group:         Applications/Shells
 Source0:       http://ftp.midnight-commander.org/%{name}-%{version}.tar.xz
-# Source0-md5: 19f14d368001aac454c28a2ddd2e851b
+# Source0-md5: 3c1f77b71dba1f4eeeedc4276627fed7
 Source3:       %{name}-non-english-man-pages.tar.bz2
 # Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19
 Source7:       %{name}.desktop
@@ -35,17 +35,20 @@ Patch4:             %{name}-confirm-exit.patch
 Patch5:                %{name}-noperl-vfs.patch
 # at now syntax highligthing for PLD-update-TODO and CVSROOT/users
 Patch6:                %{name}-pld-developerfriendly.patch
+Patch7:                ebook-ext.patch
+Patch8:                zip.patch
 URL:           http://www.midnight-commander.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1.5
 %{?with_ext2undel:BuildRequires:       e2fsprogs-devel}
-BuildRequires: gettext-tools >= 0.14.3
-BuildRequires: glib2-devel >= 2.8
+BuildRequires: file
+BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: glib2-devel >= 1:2.30.0
 %ifnarch s390 s390x
 BuildRequires: gpm-devel
 %endif
 BuildRequires: libssh2-devel >= 1.2.5
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: pam-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
@@ -53,8 +56,12 @@ BuildRequires:       rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
 BuildRequires: slang-devel >= 2.2.1
+BuildRequires: tar >= 1:1.22
 %{?with_x:BuildRequires:       xorg-lib-libX11-devel}
+BuildRequires: xz
 Requires:      file
+Requires:      glib2 >= 1:2.30.0
+Requires:      libssh2 >= 1.2.5
 Requires:      pam >= 0.77.3
 Requires:      sed
 Requires:      setup >= 2.4.6-2
@@ -165,12 +172,14 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir.
 %patch4 -p1
 %{!?with_perl_vfs:%patch5 -p1}
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %{__rm} po/stamp-po
 
 %{__sed} -i 's:|hxx|:|hxx|tcc|:' misc/syntax/Syntax.in
 
-sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
        src/vfs/extfs/helpers/uc1541
 
 %build
@@ -178,6 +187,7 @@ sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 
 export X11_WWW="xdg-open"
@@ -235,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc NEWS README
-%config /etc/shrc.d/*
+%config /etc/shrc.d/mc.*
 %attr(755,root,root) %{_bindir}/mc*
 %dir %{_libexecdir}/mc
 %attr(755,root,root) %{_libexecdir}/mc/cons.saver
@@ -261,10 +271,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sr) %{_datadir}/mc/help/mc.hlp.sr
 %dir %{_datadir}/mc/hints
 %{_datadir}/mc/hints/mc.hint
-# disabled hint files contain only English messages (as for 4.8.21)
-#%lang(af) %{_datadir}/mc/hints/mc.hint.af
-#%lang(ar) %{_datadir}/mc/hints/mc.hint.ar
-#%lang(az) %{_datadir}/mc/hints/mc.hint.az
+# disabled hint files contain only English messages (as for 4.8.26)
 %lang(be) %{_datadir}/mc/hints/mc.hint.be
 %lang(bg) %{_datadir}/mc/hints/mc.hint.bg
 %lang(ca) %{_datadir}/mc/hints/mc.hint.ca
@@ -279,21 +286,17 @@ 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
-#%lang(fi) %{_datadir}/mc/hints/mc.hint.fi
 %lang(fr) %{_datadir}/mc/hints/mc.hint.fr
 #%lang(fr_CA) %{_datadir}/mc/hints/mc.hint.fr_CA
 %lang(ga) %{_datadir}/mc/hints/mc.hint.ga
 %lang(gl) %{_datadir}/mc/hints/mc.hint.gl
-#%lang(hr) %{_datadir}/mc/hints/mc.hint.hr
 %lang(hu) %{_datadir}/mc/hints/mc.hint.hu
-#%lang(ia) %{_datadir}/mc/hints/mc.hint.ia
 %lang(id) %{_datadir}/mc/hints/mc.hint.id
 %lang(it) %{_datadir}/mc/hints/mc.hint.it
 %lang(ja) %{_datadir}/mc/hints/mc.hint.ja
-#%lang(ka) %{_datadir}/mc/hints/mc.hint.ka
-#%lang(kk) %{_datadir}/mc/hints/mc.hint.kk
-#%lang(ko) %{_datadir}/mc/hints/mc.hint.ko
+%lang(ko) %{_datadir}/mc/hints/mc.hint.ko
 %lang(lt) %{_datadir}/mc/hints/mc.hint.lt
+%lang(nb) %{_datadir}/mc/hints/mc.hint.nb
 %lang(nl) %{_datadir}/mc/hints/mc.hint.nl
 %lang(pl) %{_datadir}/mc/hints/mc.hint.pl
 %lang(pt) %{_datadir}/mc/hints/mc.hint.pt
@@ -301,15 +304,12 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ro) %{_datadir}/mc/hints/mc.hint.ro
 %lang(ru) %{_datadir}/mc/hints/mc.hint.ru
 %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(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(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
+%lang(zh_TW) %{_datadir}/mc/hints/mc.hint.zh_TW
 
 %dir %{_libexecdir}/mc/ext.d
 %attr(755,root,root) %{_libexecdir}/mc/ext.d/archive.sh
@@ -354,7 +354,9 @@ rm -rf $RPM_BUILD_ROOT
 %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/unar
 %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