X-Git-Url: http://git.pld-linux.org/?p=packages%2Fzsh.git;a=blobdiff_plain;f=zsh.spec;h=45675aa522796ee237f5878135a24b70c1153482;hp=9e8d98d1d540e4cbcc0d6601eb946ff6ca6e90ba;hb=15534fd;hpb=bf98a40af2e45c0d27b0432f4b3c66d7cc406282

diff --git a/zsh.spec b/zsh.spec
index 9e8d98d..45675aa 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,58 +1,59 @@
 #
-# todo:
-# - add zsh-lovers man page from http://grml.org/zsh/
-#
+# TODO: package http://www.zsh.org/pub/zsh-%{version}-doc.tar.xz
 # Conditional build:
-%bcond_with	static # build static version
+%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
 Summary(es.UTF-8):	Shell bourne mejorada
 Summary(fr.UTF-8):	Bourne shell amélioré
+Summary(hu.UTF-8):	Kiterjesztett Bourne Shell
 Summary(pl.UTF-8):	Ulepszona powłoka Bourne'a
 Summary(pt_BR.UTF-8):	Shell bourne melhorada
 Summary(ru.UTF-8):	Командный процессор (shell) похожый на ksh, но с улучшениями
 Summary(tr.UTF-8):	Gelişmiş bir BASH sürümü
 Summary(uk.UTF-8):	Командний процесор (shell) схожий на ksh, але з покращеннями
 Name:		zsh
-Version:	4.3.2
-Release:	2
+Version:	5.7
+Release:	1
 License:	BSD-like
 Group:		Applications/Shells
-URL:		http://www.zsh.org/
-Source0:	ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
-# Source0-md5:	e13fc4bb338fbb27ef7508a474310c8f
+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:	0d80ba1ef39052c512cfabf368f3bf20
+# 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
-Patch5:		%{name}-autoconf.patch
-Patch6:		%{name}-lfs.patch
-BuildRequires:	autoconf
+URL:		http://www.zsh.org/
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
+BuildRequires:	gdbm-devel
 %{?with_static:BuildRequires:	glibc-static}
 BuildRequires:	libcap-devel
 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
 Requires:	findutils
+Obsoletes:	zsh-doc-dvi
 Obsoletes:	zsh-doc-html
 Obsoletes:	zsh-doc-ps
-Obsoletes:	zsh-doc-dvi
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
-%define		specflags_ia32	 -fomit-frame-pointer 
+%define		specflags_ia32	-fomit-frame-pointer
 
 %description
 zsh is an enhanced version of the Bourne shell with csh additions and
@@ -75,6 +76,10 @@ shell) に似ていますが,かなり拡張されています. zsh
 グ可能なコマンド補完機能, (動的ロードされる)シェル機能, ヒストリ機構
 などを持ちます.
 
+%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.
+
 %description -l pl.UTF-8
 zsh jest ulepszoną powłoką Bourne'a z elementami powłoki csh. Posiada
 większość cech ksh, bash i tcsh.
@@ -102,20 +107,26 @@ shell-функції (з автозавантаженням), історію к
 
 %package completions
 Summary:	Files needed for advanced TAB-completion
+Summary(hu.UTF-8):	A haladó TAB-kiegészítéshez szükséges fájlok
 Summary(pl.UTF-8):	Pliki potrzebne dla zaawansowanej TAB-completion
 Group:		Applications/Shells
-Conflicts:	kdesdk-completions-zsh <= 3:3.2.3-2
 Requires:	%{name} = %{version}-%{release}
+Conflicts:	kdesdk-completions-zsh <= 3:3.2.3-2
 
 %description completions
 This package contains files needed for advanced tab completion in zsh.
 
+%description completions -l hu.UTF-8
+Ez a csomag tartalmazza a haladó TAB-kiegészítéshez szükséges fájlokat
+a zsh shell-hez.
+
 %description completions -l pl.UTF-8
 Ten pakiet zawiera pliki wymagane przez zsh dla zaawansowanej
 TAB-completion.
 
 %package static
 Summary:	Statically linked Enhanced Bourne shell
+Summary(hu.UTF-8):	A zsh statikus verziója
 Summary(pl.UTF-8):	Zaawansowana powłoka Bourne'a - skonsolidowana statycznie
 Group:		Applications/Shells
 Requires(post,preun):	grep
@@ -126,6 +137,9 @@ Requires:	%{name} = %{version}-%{release}
 zsh is an enhanced version of the Bourne shell with csh additions and
 most features of ksh, bash, and tcsh.
 
+%description static -l hu.UTF-8
+A zsh statikus verziója.
+
 %description static -l pl.UTF-8
 zsh jest ulepszoną powłoką Bourne'a z elementami powłoki csh. Posiada
 większość cech ksh, bash i tcsh. W tym pakiecie jest wersja
@@ -133,6 +147,7 @@ skonsolidowana statycznie.
 
 %package guide
 Summary:	A User's Guide to the Z-Shell
+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/
@@ -140,27 +155,29 @@ URL:		http://zsh.sunsite.dk/Guide/
 %description guide
 A User's Guide to the Z-Shell.
 
+%description guide -l hu.UTF-8
+Felhasználói útmutató a Z-Shell-hez.
+
 %description guide -l pl.UTF-8
 Podręcznik Użytkownika Z-Shella.
 
 %prep
 %setup -q
-#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 install %{SOURCE2} .
 
+find Functions -type f -exec %{__sed} -i -e 's|#!.*/zsh|#!/bin/zsh|g' "{}" ";"
+
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %{__autoheader}
 echo > stamp-h.in
-CPPFLAGS="-I/usr/include/ncurses $CPPFLAGS"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 
 %if %{with static}
 LDFLAGS="%{rpmldflags} -static"
@@ -171,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
@@ -182,12 +199,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}.ztst
+fi
+%{__make} test
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -204,7 +228,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 -f 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
 
@@ -216,12 +240,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 umask 022
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
 if [ ! -f /etc/shells ]; then
 	echo "%{_bindir}/zsh" >> /etc/shells
 else
 	grep -q '^%{_bindir}/zsh$' /etc/shells || echo "%{_bindir}/zsh" >> /etc/shells
 fi
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
 for i in zlogin zlogout zprofile zshenv zshrc; do
 	[ -f /etc/$i ] && zsh -c "zcompile /etc/$i"
 done
@@ -233,8 +257,8 @@ if [ "$1" = "0" ]; then
 	mv -f /etc/shells.new /etc/shells
 fi
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
+%postun	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post static
 umask 022
@@ -253,22 +277,20 @@ 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
+%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*