X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=zsh.spec;h=440199f12659267c5800d60180926d99abab3246;hb=dcecff6;hp=060917e1d136bb250c4e912686e505feba4cd471;hpb=36ebb9beda848a717a520aeafd0bc731239fb62f;p=packages%2Fzsh.git

diff --git a/zsh.spec b/zsh.spec
index 060917e..440199f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -15,13 +15,12 @@ Summary(ru.UTF-8):	Командный процессор (shell) похожый
 Summary(tr.UTF-8):	Gelişmiş bir BASH sürümü
 Summary(uk.UTF-8):	Командний процесор (shell) схожий на ksh, але з покращеннями
 Name:		zsh
-Version:	5.4.2
-Release:	1
+Version:	5.7
+Release:	2
 License:	BSD-like
 Group:		Applications/Shells
 Source0:	http://downloads.sourceforge.net/zsh/%{name}-%{version}.tar.xz
-# Source0-md5:	afba2dfb445a3eb79bd73330fc005ef7
-#Source0:	ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
+# Source0-md5:	4f855abd9be566bcb204e407cf571d09
 Source1:	%{name}.1.pl
 Source2:	http://zsh.sunsite.dk/Guide/%{name}guide.pdf
 # Source2-md5:	70cc3760dd8140f9aed693d484cd87dc
@@ -41,7 +40,9 @@ BuildRequires:	ncurses-devel >= 5.1
 %{?with_static:BuildRequires:	ncurses-static}
 BuildRequires:	pcre-devel
 BuildRequires:	rpmbuild(macros) >= 1.470
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
+BuildRequires:	xz
 BuildRequires:	yodl
 Requires(post,preun):	grep
 Requires(preun):	fileutils
@@ -187,7 +188,7 @@ LDFLAGS="%{rpmldflags} -static"
 	--disable-dynamic
 %{__make} \
 	DLLDFLAGS=""
-mv -f Src/zsh Src/zsh.static
+%{__mv} Src/zsh Src/zsh.static
 %{__make} clean || :
 LDFLAGS="%{rpmldflags}"
 %endif
@@ -207,7 +208,7 @@ cd ..
 
 %if %{with tests}
 if ! tty; then
-	rm Test/{C02cond.ztst,Y01completion.ztst,Y02compmatch.ztst,Y03arguments.ztst}
+	%{__rm} Test/{C02cond,Y01completion,Y02compmatch,Y03arguments,V08zpty,W02jobs,X02zlevi,X03zlebindkey,X04zlehighlight}.ztst
 fi
 %{__make} test
 %endif
@@ -280,7 +281,6 @@ fi
 %attr(755,root,root) %{_bindir}/zsh
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/*[!w]?
 %ghost %{_sysconfdir}/z*.zwc
-%dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/%{version}*
 %dir %{_datadir}/zsh/%{version}*/functions
 %{_datadir}/zsh/%{version}*/functions/[!_c]*
@@ -289,7 +289,6 @@ fi
 %{_datadir}/zsh/%{version}*/help
 %{_datadir}/zsh/%{version}*/scripts
 %{_datadir}/zsh/latest
-%{_datadir}/zsh/site-functions
 %dir %{_libdir}/zsh
 %dir %{_libdir}/zsh/%{version}*
 %attr(755,root,root) %{_libdir}/zsh/%{version}*/*