X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=zsh.spec;h=b4f15f2e8fad61cf42054f730532208489696957;hb=424f1ac6d3a6d69ad33caf25e7e125a033779735;hp=82891f76892ba3d3348eb1074e42c07906942763;hpb=904a2054e0f2ea1bcdcd403b6a641f688078b2b7;p=packages%2Fzsh.git

diff --git a/zsh.spec b/zsh.spec
index 82891f7..b4f15f2 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 # _without_static	- without static version
 #
-Summary:	Enhanced bourne shell
+Summary:	Enhanced Bourne shell
 Summary(de):	Enhanced Bourne Shell
 Summary(es):	Shell bourne mejorada
 Summary(fr):	Bourne shell amélioré
@@ -13,7 +13,7 @@ Summary(tr):	Geli
 Summary(uk):	ëÏÍÁÎÄÎÉÊ ÐÒÏÃÅÓÏÒ (shell) ÓÈÏÖÉÊ ÎÁ ksh, ÁÌÅ Ú ÐÏËÒÁÝÅÎÎÑÍÉ
 Name:		zsh
 Version:	4.1.1
-Release:	1
+Release:	7
 License:	BSD-like
 Group:		Applications/Shells
 URL:		http://www.zsh.org/
@@ -28,12 +28,13 @@ Patch2:		%{name}-addons.patch
 Patch3:		%{name}-paths.patch
 Patch4:		%{name}-no_nis.patch
 Patch5:		%{name}-completions.patch
-PreReq:		grep
-PreReq:		fileutils
+Patch6:		%{name}-zle_misc.patch
 BuildRequires:	autoconf
 %{!?_without_static:BuildRequires:	glibc-static}
+BuildRequires:	libcap-devel
 BuildRequires:	ncurses-devel >= 5.1
 %{!?_without_static:BuildRequires:	ncurses-static}
+BuildRequires:	pcre-devel
 BuildRequires:	texinfo
 Requires(post,preun):	grep
 Requires(preun):	fileutils
@@ -41,6 +42,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	zsh-doc-html, zsh-doc-ps, zsh-doc-dvi
 
 %define		_bindir		/bin
+%define		specflags_ia32	"-fomit-frame-pointer"
 
 %description
 zsh is an enhanced version of the Bourne shell with csh additions and
@@ -102,8 +104,8 @@ Ten pakiet zawiera pliki wymagane przez zsh dla zaawansowanej
 TAB-completion.
 
 %package static
-Summary:	Statically linked Enhanced bourne shell
-Summary(pl):	Zaawansowany bourne SHell - linkowany statycznie
+Summary:	Statically linked Enhanced Bourne shell
+Summary(pl):	Zaawansowana pow³oka Bourne'a - skonsolidowana statycznie
 Group:		Applications/Shells
 Requires(post,preun):	grep
 Requires(preun):	fileutils
@@ -115,8 +117,8 @@ most features of ksh, bash, and tcsh.
 
 %description static -l pl
 zsh jest ulepszon± pow³ok± Bourne'a z elementami pow³oki csh. Posiada
-wiêkszo¶æ cech ksh, bash i tcsh. W tym pakiecie jest statycznie
-linkowany.
+wiêkszo¶æ cech ksh, bash i tcsh. W tym pakiecie jest wersja
+skonsolidowana statycznie.
 
 %package guide
 Summary:	A User's Guide to the Z-Shell
@@ -138,6 +140,7 @@ Podr
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
 
 install %{SOURCE2} .
 
@@ -146,9 +149,12 @@ install %{SOURCE2} .
 
 %if %{!?_without_static:1}%{?_without_static:0}
 LDFLAGS="%{rpmldflags} -static"
-%configure
-%{__make}
+%configure \
+	--disable-dynamic
+%{__make} \
+	DLLDFLAGS=""
 mv -f Src/zsh Src/zsh.static
+%{__make} clean || :
 LDFLAGS="%{rpmldflags}"
 %endif
 
@@ -163,7 +169,8 @@ makeinfo zsh.texi
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_infodir},%{_sysconfdir},%{_bindir},%{_mandir}/pl/man1}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %{!?_without_static:install Src/zsh.static $RPM_BUILD_ROOT%{_bindir}}
 install Doc/zsh.info*	$RPM_BUILD_ROOT%{_infodir}
@@ -173,18 +180,33 @@ echo "setopt no_function_argzero" > $RPM_BUILD_ROOT%{_sysconfdir}/zprofile
 echo ". %{_sysconfdir}/profile" >> $RPM_BUILD_ROOT%{_sysconfdir}/zprofile
 
 cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/zshrc
-PS1='[%%n@%%m %%~]%%(!.#.%%\\$) '
-bindkey -e >/dev/null 2>&1
+# System wide functions and aliases
+# Environment stuff goes in /etc/profile
+
+# Aliases:
 alias which=whence
+alias cd='builtin cd'
+alias precmd=' precmd'
+
+setopt histignorespace
+
+# Setup key bindings:
+bindkey -e >/dev/null 2>&1
 
-# xterm
 bindkey \`tput khome\` beginning-of-line >/dev/null 2>&1
 bindkey \`tput kend\` end-of-line >/dev/null 2>&1
+bindkey \`tput kich1\` quoted-insert >/dev/null 2>&1
 bindkey \`tput kdch1\` delete-char >/dev/null 2>&1
 bindkey \`tput kpp\` up-history >/dev/null 2>&1
 bindkey \`tput knp\` end-of-history >/dev/null 2>&1
 bindkey \`tput kcuu1\` history-beginning-search-backward >/dev/null 2>&1
 bindkey \`tput kcud1\` history-beginning-search-forward >/dev/null 2>&1
+
+case "$TERM" in
+	xterm*)
+		precmd () { print -Pn "\e]0;%n@%m: %~\a"i; }
+		;;
+esac
 EOF
 
 rm -f Etc/Makefile*