X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmc.git;a=blobdiff_plain;f=mc.spec;h=663a557410fadff15fad1c10d688b91f9a227fab;hp=f197a86daaf5896f44cf3b3a4aa91c807a9c36aa;hb=HEAD;hpb=5c49238db8281aa9178aa6cf12ec6c5393c79393

diff --git a/mc.spec b/mc.spec
index f197a86..48d379f 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,8 +1,6 @@
 #
 # Conditional build:
 %bcond_with	ext2undel	# with ext2 undelete fs
-%bcond_without	perl_vfs	# without perl depending vfs'es -- to avoid perl autoreq
-%bcond_with	samba		# with SAMBA vfs support
 %bcond_without	x		# without text edit in X support
 #
 Summary:	A user-friendly file manager and visual shell
@@ -18,35 +16,33 @@ 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.20
+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:	7f808b01f3f7d9aa52152a9efb86dbca
-Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source0-md5:	2c3dd9af66e4cfef5a7a460df1cdf868
+Source3:	%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	17d7b574e1b85ad6f8ddceda9e841f19
 Source7:	%{name}.desktop
 Source8:	%{name}.png
 Patch1:		%{name}-no-ws-visible.patch
 Patch2:		%{name}-no-compute-totals.patch
 Patch3:		%{name}-file-find-case-insensitive.patch
-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
+Patch4:		ebook-ext.patch
 URL:		http://www.midnight-commander.org/
-BuildRequires:	autoconf >= 2.60
-BuildRequires:	automake >= 1.5
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.12
 %{?with_ext2undel:BuildRequires:	e2fsprogs-devel}
-BuildRequires:	gettext-tools >= 0.14.3
-BuildRequires:	glib2-devel >= 2.8
+BuildRequires:	file
+BuildRequires:	gettext-tools >= 0.21
+BuildRequires:	glib2-devel >= 1:2.30.0
 %ifnarch s390 s390x
 BuildRequires:	gpm-devel
 %endif
-BuildRequires:	libssh2-devel >= 1.2.5
-BuildRequires:	libtool
+BuildRequires:	libssh2-devel >= 1.2.8
+BuildRequires:	libtool >= 2:2
 BuildRequires:	pam-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
@@ -54,8 +50,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.8
 Requires:	pam >= 0.77.3
 Requires:	sed
 Requires:	setup >= 2.4.6-2
@@ -70,7 +70,7 @@ Suggests:	ghostscript
 Suggests:	groff
 Suggests:	gzip
 Suggests:	lha
-Suggests:	links
+Suggests:	links2
 Suggests:	lynx
 Suggests:	lzma
 Suggests:	odt2txt
@@ -85,10 +85,10 @@ Suggests:	xdg-utils
 Suggests:	xpdf-tools
 Suggests:	xz
 Suggests:	zoo
-Obsoletes:	mc46
-Obsoletes:	mc46serv
-Obsoletes:	mcserv
-Obsoletes:	tkmc
+Obsoletes:	mc46 < 1:4.7
+Obsoletes:	mc46serv < 1:4.7
+Obsoletes:	mcserv < 1:4.7.4
+Obsoletes:	tkmc < 4.1.35
 Conflicts:	bash < 2.05b
 Conflicts:	rpm < 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -164,26 +164,26 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%{!?with_perl_vfs:%patch5 -p1}
-%patch6 -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+python3(\s|$),#!%{__python3}\1,' \
+	src/vfs/extfs/helpers/uc1541
+
 %build
 %{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 
 export X11_WWW="xdg-open"
 %configure \
+	PYTHON=%{_bindir}/python3 \
 	%{?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-gpm-mouse \
 	--with-pcre \
@@ -217,12 +217,7 @@ install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/shrc.d
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/mcserv.8
 
-# just a copy of sv
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/mc/hints/mc.hint.sv_SE
-# another variant of it
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/mc/hints/mc.hint.it_IT
-# enhanced version
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/mc/hints/mc.hint.{zh,zh_CN}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
 
 %find_lang %{name}
 
@@ -232,7 +227,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
@@ -258,15 +253,12 @@ 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.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
+# 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
+%lang(ca) %{_datadir}/mc/hints/mc.hint.ca
 %lang(cs) %{_datadir}/mc/hints/mc.hint.cs
-#%lang(da) %{_datadir}/mc/hints/mc.hint.da
+%lang(da) %{_datadir}/mc/hints/mc.hint.da
 %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
@@ -276,20 +268,18 @@ 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(lt) %{_datadir}/mc/hints/mc.hint.lt
+%lang(ja) %{_datadir}/mc/hints/mc.hint.ja
+%lang(ka) %{_datadir}/mc/hints/mc.hint.ka
+%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
@@ -297,15 +287,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(sv) %{_datadir}/mc/hints/mc.hint.sv
 %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
@@ -320,26 +307,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_libexecdir}/mc/extfs.d
 %{_libexecdir}/mc/extfs.d/README*
-%if %{with perl_vfs}
 %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) %{_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/deb*
+%attr(755,root,root) %{_libexecdir}/mc/extfs.d/dpkg+
 %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/mailfs
+%attr(755,root,root) %{_libexecdir}/mc/extfs.d/patchfs
 %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/rpms+
 %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
@@ -350,11 +333,15 @@ 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/ulib
+%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/uzip
 %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