X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=zsh.spec;h=55a6ba03d8c8bb61e0b5cf64cace587829bdaf21;hb=2cbe567;hp=4b415df57467a9513b4a0dcbf3b96c7bca41a1db;hpb=8f87bfe633b6ce086c0992c31eb2c27af69e586e;p=packages%2Fzsh.git

diff --git a/zsh.spec b/zsh.spec
index 4b415df..55a6ba0 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,6 +1,8 @@
 #
+# 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"
 #
 Summary:	Enhanced Bourne shell
 Summary(de.UTF-8):	Enhanced Bourne Shell
@@ -13,25 +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:	4.3.17
-Release:	2
+Version:	5.8.1
+Release:	1
 License:	BSD-like
 Group:		Applications/Shells
-Source0:	ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/%{name}-%{version}.tar.bz2
-# Source0-md5:	8258967060b2654f30001a011946ac6a
-#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}
@@ -39,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
@@ -74,7 +77,7 @@ shell) に似ていますが,かなり拡張されています. zsh
 グ可能なコマンド補完機能, (動的ロードされる)シェル機能, ヒストリ機構
 などを持ちます.
 
-%description  -l hu.UTF-8
+%description -l hu.UTF-8
 zsh a Bourne shell egy kiterjesztett verziója csh kiegészítésekkel és
 a ksh, bash és csh legtöbb lehetőségével felvértezve.
 
@@ -110,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.
@@ -149,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.
@@ -164,7 +169,6 @@ Podręcznik Użytkownika Z-Shella.
 %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
@@ -198,12 +202,19 @@ LDFLAGS="%{rpmldflags}"
 	--enable-cap \
 	--enable-pcre \
 	--enable-multibyte \
-	--with-curses-terminfo \
 	--with-tcsetpgrp
 %{__make}
 
 cd Doc
 makeinfo zsh.texi
+cd ..
+
+%if %{with tests}
+if ! tty; then
+	%{__rm} Test/{C02cond,Y01completion,Y02compmatch,Y03arguments,V08zpty,W02jobs,X02zlevi,X03zlebindkey,X04zlehighlight}.ztst
+fi
+%{__make} test
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -220,7 +231,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/{zlogin,zlogout,zprofile,zshenv,zshrc}.zwc
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
 
-%{__rm} Etc/Makefile*
+%{__rm} -f Etc/Makefile*
 find Functions Util StartupFiles -name .distfiles -o -name .cvsignore | xargs rm -f
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/pl/man1/zsh.1
 
@@ -269,22 +280,24 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc Etc/* README LICENCE ChangeLog META-FAQ Util StartupFiles
+%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]?
-%ghost %{_sysconfdir}/*.zwc
-%dir %{_libdir}/zsh
-%dir %{_libdir}/zsh/%{version}*
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/latest
+%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}*/scripts
-%{_datadir}/zsh/%{version}*/scripts/newuser
 %dir %{_datadir}/zsh/%{version}*/functions
 %{_datadir}/zsh/%{version}*/functions/[!_c]*
 %{_datadir}/zsh/%{version}*/functions/c[!o]*
 %{_datadir}/zsh/%{version}*/functions/co[!m]*
+%{_datadir}/zsh/%{version}*/help
+%{_datadir}/zsh/%{version}*/scripts
+%{_datadir}/zsh/latest
+%dir %{_libdir}/zsh
+%dir %{_libdir}/zsh/%{version}*
 %attr(755,root,root) %{_libdir}/zsh/%{version}*/*
 %{_infodir}/zsh.info*
 %{_mandir}/man1/zsh*.1*