rpm version for noarch subpackage

[packages/zsh.git] / zsh.spec

diff --git a/zsh.spec b/zsh.spec
index 70a19572a8129f6d5ce9d21f446b18de06c63573..55a6ba03d8c8bb61e0b5cf64cace587829bdaf21 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -15,24 +15,23 @@ 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:       3
+Version:       5.8.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:       https://downloads.sourceforge.net/zsh/%{name}-%{version}.tar.xz
+# Source0-md5: 063a98c256ee0584b3c115924e41a332
 Source1:       %{name}.1.pl
-Source2:       http://zsh.sunsite.dk/Guide/%{name}guide.pdf
-# Source2-md5: 70cc3760dd8140f9aed693d484cd87dc
+Source2:       https://zsh.sourceforge.io/Guide/zshguide.pdf
+# Source2-md5: 409cbf8cbabb2c6bee88aac5c8279718
 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}
@@ -40,8 +39,11 @@ BuildRequires:       libcap-devel
 BuildRequires: ncurses-devel >= 5.1
 %{?with_static:BuildRequires:  ncurses-static}
 BuildRequires: pcre-devel
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.470
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
+BuildRequires: xz
 BuildRequires: yodl
 Requires(post,preun):  grep
 Requires(preun):       fileutils
@@ -111,6 +113,7 @@ Summary(pl.UTF-8):  Pliki potrzebne dla zaawansowanej TAB-completion
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Conflicts:     kdesdk-completions-zsh <= 3:3.2.3-2
+BuildArch:     noarch
 
 %description completions
 This package contains files needed for advanced tab completion in zsh.
@@ -150,6 +153,7 @@ Summary(hu.UTF-8):  Felhasználói útmutató a Z-Shell-hez
 Summary(pl.UTF-8):     Podręcznik Użytkownika Z-Shella
 Group:         Documentation
 URL:           http://zsh.sunsite.dk/Guide/
+BuildArch:     noarch
 
 %description guide
 A User's Guide to the Z-Shell.
@@ -162,9 +166,9 @@ Podręcznik Użytkownika Z-Shella.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 install %{SOURCE2} .
@@ -187,7 +191,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 +211,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,7 +282,11 @@ 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/%{version}*
 %dir %{_datadir}/zsh/%{version}*/functions