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

diff --git a/mc.spec b/mc.spec
index 663a557..f49c4d4 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,7 +1,7 @@
+#
 # 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
@@ -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.26
+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:	3c1f77b71dba1f4eeeedc4276627fed7
+# Source0-md5:	2c3dd9af66e4cfef5a7a460df1cdf868
 Source3:	%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	17d7b574e1b85ad6f8ddceda9e841f19
 Source7:	%{name}.desktop
@@ -31,23 +31,19 @@ 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
-Patch7:		ebook-ext.patch
-Patch8:		zip.patch
+Patch4:		%{name}-noperl-vfs.patch
+Patch5:		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:	file
-BuildRequires:	gettext-tools >= 0.18.1
+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:	libssh2-devel >= 1.2.8
 BuildRequires:	libtool >= 2:2
 BuildRequires:	pam-devel
 BuildRequires:	pcre-devel
@@ -61,7 +57,7 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	file
 Requires:	glib2 >= 1:2.30.0
-Requires:	libssh2 >= 1.2.5
+Requires:	libssh2 >= 1.2.8
 Requires:	pam >= 0.77.3
 Requires:	sed
 Requires:	setup >= 2.4.6-2
@@ -76,7 +72,7 @@ Suggests:	ghostscript
 Suggests:	groff
 Suggests:	gzip
 Suggests:	lha
-Suggests:	links
+Suggests:	links2
 Suggests:	lynx
 Suggests:	lzma
 Suggests:	odt2txt
@@ -91,10 +87,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)
@@ -169,17 +165,14 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%{!?with_perl_vfs:%patch5 -p1}
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%{!?with_perl_vfs:%patch4 -p1}
+%patch5 -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|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
 	src/vfs/extfs/helpers/uc1541
 
 %build
@@ -194,9 +187,6 @@ 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 \
@@ -230,12 +220,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}
 
@@ -294,6 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 %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(ko) %{_datadir}/mc/hints/mc.hint.ko
 %lang(lt) %{_datadir}/mc/hints/mc.hint.lt
 %lang(nb) %{_datadir}/mc/hints/mc.hint.nb
@@ -358,9 +344,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