up to 5.7

[packages/zsh.git] / zsh.spec

diff --git a/zsh.spec b/zsh.spec
index 937ca3ee9ff2b4d86078235310ae95a3798ca545..45675aa522796ee237f5878135a24b70c1153482 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,4 +1,5 @@
 #
+# TODO: package http://www.zsh.org/pub/zsh-%{version}-doc.tar.xz
 # Conditional build:
 %bcond_with    static  # build static version
 %bcond_without tests   # don't perform "make test"
@@ -14,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
+Version:       5.7
 Release:       1
 License:       BSD-like
 Group:         Applications/Shells
-Source0:       ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/%{name}-%{version}.tar.xz
-# Source0-md5: dfe156fd69b0d8d1745ecf6d6e02e047
-#Source0:      ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
+Source0:       http://downloads.sourceforge.net/zsh/%{name}-%{version}.tar.xz
+# Source0-md5: 4f855abd9be566bcb204e407cf571d09
 Source1:       %{name}.1.pl
 Source2:       http://zsh.sunsite.dk/Guide/%{name}guide.pdf
 # Source2-md5: 70cc3760dd8140f9aed693d484cd87dc
@@ -40,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
@@ -186,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
@@ -206,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}.ztst
 fi
 %{__make} test
 %endif
@@ -279,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]*
@@ -288,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}*/*