X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=zsh.spec;h=097ea7768db506847b68bb32313bdb9e2d521da1;hb=8b0be83c4fae68bb569dcc41c62be745328958b6;hp=f579c968f5f73588f38f8b9281d5320a9682fbc3;hpb=a2d70cc1b59ed34bf6a73900fb8ca2689ff7ad65;p=packages%2Fzsh.git

diff --git a/zsh.spec b/zsh.spec
index f579c96..097ea77 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,79 +1,140 @@
-# $Revision: 1.41 $ $Date: 2001-08-25 11:52:15 $
 #
 # Conditional build:
-# _without_static       - without static version
+%bcond_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é
-Summary(tr):	Geliþmiþ bir BASH sürümü
 Summary(pl):	Ulepszona pow³oka Bourne'a
+Summary(pt_BR):	Shell bourne melhorada
+Summary(ru):	ëÏÍÁÎÄÎÙÊ ÐÒÏÃÅÓÓÏÒ (shell) ÐÏÈÏÖÙÊ ÎÁ ksh, ÎÏ Ó ÕÌÕÞÛÅÎÉÑÍÉ
+Summary(tr):	Geliþmiþ bir BASH sürümü
+Summary(uk):	ëÏÍÁÎÄÎÉÊ ÐÒÏÃÅÓÏÒ (shell) ÓÈÏÖÉÊ ÎÁ ksh, ÁÌÅ Ú ÐÏËÒÁÝÅÎÎÑÍÉ
 Name:		zsh
-Version:	4.0.2
-Release:	5
+Version:	4.2.5
+Release:	1
 License:	BSD-like
 Group:		Applications/Shells
-Group(de):	Applikationen/Shells
-Group(pl):	Aplikacje/Pow³oki
 URL:		http://www.zsh.org/
-Source0:	ftp://ftp.zsh.org/pub/zsh/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
+# Source0-md5:	e2060f743dcdf3b383e80e862a6548fe
+Source1:	%{name}.1.pl
+Source2:	http://zsh.sunsite.dk/Guide/zshguide.pdf
+# Source2-md5:	0d80ba1ef39052c512cfabf368f3bf20
+Source3:	zprofile
+Source4:	zshrc
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-tinfo.patch
-Patch2:		%{name}-addons.patch
-Patch3:		%{name}-paths.patch
-Patch4:		%{name}-no_nis.patch
-Prereq:		grep
-Prereq:		fileutils
+Patch1:		%{name}-addons.patch
+Patch2:		%{name}-paths.patch
+Patch3:		%{name}-completions.patch
+Patch4:		%{name}-nolibs.patch
+Patch5:		%{name}-broken_configure.patch
+Patch6:		%{name}-svn.patch
 BuildRequires:	autoconf
+%{?with_static:BuildRequires:	glibc-static}
+BuildRequires:	libcap-devel
 BuildRequires:	ncurses-devel >= 5.1
+%{?with_static:BuildRequires:	ncurses-static}
+BuildRequires:	pcre-devel
 BuildRequires:	texinfo
-%{!?_without_static:BuildRequires:	glibc-static}
-%{!?_without_static:BuildRequires:	ncurses-static}
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Provides:	which
+Requires(post,preun):	grep
+Requires(preun):	fileutils
+Requires:	findutils
 Obsoletes:	zsh-doc-html, zsh-doc-ps, zsh-doc-dvi
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
+%define		specflags_ia32	 -fomit-frame-pointer 
 
 %description
 zsh is an enhanced version of the Bourne shell with csh additions and
 most features of ksh, bash, and tcsh.
 
+%description -l es
+zsh es una versión mejorada del bourne shell con estas
+características:
+- muy próximo de la gramática del ksh/sh, con adiciones csh,
+- varias características del ksh, bash y tcsh,
+- 75 funciones empotradas, 89 opciones, 154 combinaciones de teclas,
+- selección,
+- funciones shell ...y mucho más.
+
+%description -l ja
+zsh ¥·¥§¥ë¤ÏÂÐÏÃŪ¤Ê¥í¥°¥¤¥ó¥·¥§¥ë¤È¤·¤ÆÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É¥¤¥ó¥¿¥ê¥¿
+¤Ç¤¢¤ê¡¢¥·¥§¥ë¥¹¥¯¥ê¥×¥È¥³¥Þ¥ó¥É¤â½èÍý¤Ç¤­¤Þ¤¹. zsh ¤Ï ksh(the Korn
+shell) ¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬,¤«¤Ê¤ê³ÈÄ¥¤µ¤ì¤Æ¤¤¤Þ¤¹. zsh
+¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤ÎÊÔ½¸µ¡Ç½, ÁȤ߹þ¤Þ¤ì¤¿¥¹¥Ú¥ë½¤Àµµ¡Ç½, ¥×¥í¥°¥é¥ß¥ó
+¥°²Äǽ¤Ê¥³¥Þ¥ó¥ÉÊä´°µ¡Ç½, (ưŪ¥í¡¼¥É¤µ¤ì¤ë)¥·¥§¥ëµ¡Ç½, ¥Ò¥¹¥È¥êµ¡¹½
+¤Ê¤É¤ò»ý¤Á¤Þ¤¹.
+
 %description -l pl
 zsh jest ulepszon± pow³ok± Bourne'a z elementami pow³oki csh. Posiada
 wiêkszo¶æ cech ksh, bash i tcsh.
 
+%description -l pt_BR
+zsh é uma versão melhorada do bourne shell com essas características:
+- muito próximo da gramática do ksh/sh, com adições csh,
+- várias características do ksh, bash e tcsh,
+- 75 funções embutidas, 89 opções, 154 combinações de teclas,
+- seleção,
+- funções shell ...e muito mais.
+
+%description -l ru
+zsh - ÜÔÏ ËÏÍÁÎÄÎÙÊ ÐÒÏÃÅÓÓÏÒ ÎÁÐÏÍÉÎÁÀÝÉÊ ksh (Korn shell), ÎÏ
+×ËÌÀÞÁÀÝÉÊ ÍÎÏÇÏ ÕÌÕÞÛÅÎÉÊ. zsh ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ËÏÍÁÎÄÎÏÊ
+ÓÔÒÏËÉ, ×ÓÔÒÏÅÎÎÕÀ ËÏÒÒÅËÃÉÀ ÎÁÐÉÓÁÎÉÑ, ÐÒÏÇÒÁÍÍÉÒÕÅÍÏÅ ÚÁ×ÅÒÛÅÎÉÅ
+ËÏÍÁÎÄ, shell-ÆÕÎËÃÉÉ (Ó Á×ÔÏÚÁÇÒÕÚËÏÊ), ÉÓÔÏÒÉÀ ËÏÍÁÎÄ É ÍÎÏÇÏÅ
+ÄÒÕÇÏÅ.
+
+%description -l uk
+zsh - ÃÅ ËÏÍÁÎÄÎÉÊ ÐÒÏÃÅÓÏÒ, ÝÏ ÎÁÇÁÄÕ¤ ksh (Korn shell), ÁÌÅ ×ËÌÀÞÁ¤
+ÂÁÇÁÔÏ ÐÏËÒÁÝÅÎØ. zsh ЦÄÔÒÉÍÕ¤ ÒÅÄÁÇÕ×ÁÎÎÑ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ,
+×ÂÕÄÏ×ÁÎÕ ËÏÒÅËæÀ ÎÁÐÉÓÁÎÎÑ, ÐÒÏÇÒÁÍÏ×ÁÎÅ ÚÁ×ÅÒÛÅÎÎÑ ËÏÍÁÎÄ,
+shell-ÆÕÎËæ§ (Ú Á×ÔÏÚÁ×ÁÎÔÁÖÅÎÎÑÍ), ¦ÓÔÏÒ¦À ËÏÍÁÎÄ ÔÁ ÂÁÇÁÔÏ ¦ÎÛÏÇÏ.
+
 %package completions
-Summary:        Files needed for advanced TAB-completion
-Summary(pl):    Pliki potrzebne dla zaawansowanej TAB-completion
-Group:          Applications/Shells
-Group(de):      Applikationen/Shells
-Group(pl):      Aplikacje/Pow³oki
-Requires:       %{name} = %{version}
+Summary:	Files needed for advanced TAB-completion
+Summary(pl):	Pliki potrzebne dla zaawansowanej TAB-completion
+Group:		Applications/Shells
+Conflicts:	kdesdk-completions-zsh <= 3:3.2.3-2
+Requires:	%{name} = %{version}-%{release}
 
 %description completions
 This package contains files needed for advanced tab completion in zsh.
 
-%description -l pl completions
+%description completions -l pl
 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
-Group:         Applications/Shells
-Group(de):     Applikationen/Shells
-Group(pl):     Aplikacje/Pow³oki
-Requires:      %{name} = %{version}
+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
+Requires:	%{name} = %{version}-%{release}
 
 %description static
 zsh is an enhanced version of the Bourne shell with csh additions and
 most features of ksh, bash, and tcsh.
 
-%description -l pl static
+%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
+Summary(pl):	Podrêcznik U¿ytkownika Z-Shella
+Group:		Documentation
+URL:		http://zsh.sunsite.dk/Guide/
+
+%description guide
+A User's Guide to the Z-Shell.
+
+%description guide -l pl
+Podrêcznik U¿ytkownika Z-Shella.
 
 %prep
 %setup -q
@@ -82,52 +143,77 @@ linkowany.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p0
+
+install %{SOURCE2} .
 
 %build
-autoconf
+cp -f /usr/share/automake/config.sub .
+%{__autoconf}
+CPPFLAGS="-I/usr/include/ncurses"
 
-%if %{!?_without_static:1}%{?_without_static:0}
+%if %{with static}
 LDFLAGS="%{rpmldflags} -static"
-%configure
-%{__make}
+%configure \
+	--disable-dynamic
+%{__make} \
+	DLLDFLAGS=""
 mv -f Src/zsh Src/zsh.static
+%{__make} clean || :
 LDFLAGS="%{rpmldflags}"
 %endif
 
 %configure \
-	--enable-maildir-support
+	ac_cv_have_dev_ptmx=yes \
+	--enable-maildir-support \
+	--enable-pcre \
+	--enable-cap
 %{__make}
 
-(cd Doc; makeinfo zsh.texi)
+cd Doc
+makeinfo zsh.texi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_sysconfdir},%{_bindir}}
+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}
+%{?with_static:install Src/zsh.static $RPM_BUILD_ROOT%{_bindir}}
+install Doc/zsh.info* $RPM_BUILD_ROOT%{_infodir}
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/{zlogout,zlogin,zshenv}
-echo    ". /etc/profile"                > $RPM_BUILD_ROOT%{_sysconfdir}/zprofile
-echo -e "PS1='[%%n@%%m %%~]%%(!.#.%%\\$) '\nbindkey -e >/dev/null 2>&1\nalias which=whence" > \
-                                          $RPM_BUILD_ROOT%{_sysconfdir}/zshrc
+touch $RPM_BUILD_ROOT%{_sysconfdir}/{zlogin,zlogout,zshenv}
+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*
 find Functions Util StartupFiles -name .distfiles -o -name .cvsignore | xargs rm -f
-gzip -9nf Etc/* README LICENCE ChangeLog META-FAQ
+install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/pl/man1/zsh.1
+
+# for kdesdk's completion
+ln -sf %{version} $RPM_BUILD_ROOT%{_datadir}/zsh/latest
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
+umask 022
 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
 
 %preun
 if [ "$1" = "0" ]; then
+	umask 022
 	grep -v '^%{_bindir}/zsh$' /etc/shells > /etc/shells.new
 	mv -f /etc/shells.new /etc/shells
 fi
@@ -136,46 +222,52 @@ fi
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
 
 %post static
+umask 022
 if [ ! -f /etc/shells ]; then
-       echo "%{_bindir}/zsh.static" >> /etc/shells
+	echo "%{_bindir}/zsh.static" >> /etc/shells
 else
-       grep -q '^%{_bindir}/zsh\.static$' /etc/shells || echo "%{_bindir}/zsh.static" >> /etc/shells
+	grep -q '^%{_bindir}/zsh\.static$' /etc/shells || echo "%{_bindir}/zsh.static" >> /etc/shells
 fi
 
 %preun static
 if [ "$1" = "0" ]; then
-       grep -v '^%{_bindir}/zsh\.static$' /etc/shells > /etc/shells.new
-       mv -f /etc/shells.new /etc/shells
+	umask 022
+	grep -v '^%{_bindir}/zsh\.static$' /etc/shells > /etc/shells.new
+	mv -f /etc/shells.new /etc/shells
 fi
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
-%doc *.gz Etc/* Util StartupFiles
+%doc Etc/* README LICENCE ChangeLog META-FAQ Util StartupFiles
 %attr(755,root,root) %{_bindir}/zsh
-%config %{_sysconfdir}/*
+%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
 %dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/latest
 %dir %{_datadir}/zsh/%{version}
 %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}/functions/[!_c]*
+%{_datadir}/zsh/%{version}/functions/c[!o]*
+%{_datadir}/zsh/%{version}/functions/co[!m]*
 %attr(755,root,root) %{_libdir}/zsh/%{version}/*
 %{_infodir}/zsh.info*
 %{_mandir}/man1/zsh*.1*
+%lang(pl) %{_mandir}/pl/man1/zsh*.1*
 
 %files completions
 %defattr(644,root,root,755)
 %{_datadir}/zsh/%{version}/functions/comp*
 %{_datadir}/zsh/%{version}/functions/_*
 
-%if %{!?_without_static:1}%{?_without_static:0}
+%files guide
+%defattr(644,root,root,755)
+%doc zshguide.pdf
+
+%if %{with static}
 %files static
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/zsh.static
 %endif