- (re)added info patch (unify direntry)

[packages/zsh.git] / zsh.spec

diff --git a/zsh.spec b/zsh.spec
index abf76c7539bf933feb88e181f08a0ad667d38631..197ef3dabc0775efc3582c2ffe34edd633489ed5 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -15,24 +15,24 @@ 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:       2
+Version:       5.7.1
+Release:       1
 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: 374f9fdd121b5b90e07abfcad7df0627
 Source1:       %{name}.1.pl
 Source2:       http://zsh.sunsite.dk/Guide/%{name}guide.pdf
 # Source2-md5: 70cc3760dd8140f9aed693d484cd87dc
 Source3:       zprofile
 Source4:       %{name}rc
+Patch0:                %{name}-info.patch
 Patch1:                %{name}-addons.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-completions.patch
 Patch4:                %{name}-nolibs.patch
 URL:           http://www.zsh.org/
-BuildRequires: autoconf >= 2.60
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: gdbm-devel
 %{?with_static:BuildRequires:  glibc-static}
@@ -41,7 +41,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
@@ -162,6 +164,7 @@ Podręcznik Użytkownika Z-Shella.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -187,7 +190,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 +210,7 @@ cd ..
 
 %if %{with tests}
 if ! tty; then
-       rm Test/{C02cond,Y01completion,Y02compmatch,Y03arguments,V08zpty,X02zlevi,X03zlebindkey}.ztst
+       %{__rm} Test/{C02cond,Y01completion,Y02compmatch,Y03arguments,V08zpty,W02jobs,X02zlevi,X03zlebindkey,X04zlehighlight}.ztst
 fi
 %{__make} test
 %endif
@@ -278,9 +281,12 @@ fi
 %defattr(644,root,root,755)
 %doc Etc/* ChangeLog FEATURES LICENCE META-FAQ README Misc StartupFiles Util
 %attr(755,root,root) %{_bindir}/zsh
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/*[!w]?
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/zlogin
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/zlogout
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/zprofile
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/zshenv
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/zshrc
 %ghost %{_sysconfdir}/z*.zwc
-%dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/%{version}*
 %dir %{_datadir}/zsh/%{version}*/functions
 %{_datadir}/zsh/%{version}*/functions/[!_c]*
@@ -289,8 +295,6 @@ fi
 %{_datadir}/zsh/%{version}*/help
 %{_datadir}/zsh/%{version}*/scripts
 %{_datadir}/zsh/latest
-# moved to filesystem.spec, left here with this comment to make sure is is not populated by this package
-#%{_datadir}/zsh/site-functions
 %dir %{_libdir}/zsh
 %dir %{_libdir}/zsh/%{version}*
 %attr(755,root,root) %{_libdir}/zsh/%{version}*/*