- no more optimizations

[packages/zsh.git] / zsh.spec

diff --git a/zsh.spec b/zsh.spec
index 4c7eb1d16d172cd3ae157bb3e5575a451f5b0d90..8d433429d36d05c194b9ec45a1394f9a0c9e750f 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,35 +1,41 @@
-# $Revision: 1.44 $ $Date: 2002-01-18 02:15:48 $
+# $Revision: 1.66 $ $Date: 2003-04-24 23:04:32 $

 #
 # Conditional build:
 #
 # Conditional build:

-# _without_static       - without static version
+# _without_static      - without static version

 #
 Summary:       Enhanced bourne shell
 Summary(de):   Enhanced Bourne Shell
 #
 Summary:       Enhanced bourne shell
 Summary(de):   Enhanced Bourne Shell

+Summary(es):   Shell bourne mejorada

 Summary(fr):   Bourne shell amélioré
 Summary(fr):   Bourne shell amélioré

-Summary(tr):   Geliþmiþ bir BASH sürümü

 Summary(pl):   Ulepszona pow³oka Bourne'a
 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
 Name:          zsh

-Version:       4.0.2
-Release:       6
+Version:       4.0.6
+Release:       4

 License:       BSD-like
 Group:         Applications/Shells
 License:       BSD-like
 Group:         Applications/Shells

-Group(de):     Applikationen/Shells
-Group(pl):     Aplikacje/Pow³oki

 URL:           http://www.zsh.org/
 URL:           http://www.zsh.org/

-Source0:       ftp://ftp.zsh.org/pub/zsh/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.zsh.org/pub/zsh/%{name}-%{version}.tar.bz2

 Source1:       %{name}.1.pl
 Source1:       %{name}.1.pl

+Source2:       http://zsh.sunsite.dk/Guide/zshguide.pdf

 Patch0:                %{name}-info.patch
 Patch1:                %{name}-tinfo.patch
 Patch2:                %{name}-addons.patch
 Patch3:                %{name}-paths.patch
 Patch4:                %{name}-no_nis.patch
 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
+Patch5:                %{name}-completions.patch
+PreReq:                grep
+PreReq:                fileutils

 BuildRequires: autoconf
 BuildRequires: autoconf

-BuildRequires: ncurses-devel >= 5.1
-BuildRequires: texinfo

 %{!?_without_static:BuildRequires:     glibc-static}
 %{!?_without_static:BuildRequires:     glibc-static}

+BuildRequires: ncurses-devel >= 5.1

 %{!?_without_static:BuildRequires:     ncurses-static}
 %{!?_without_static:BuildRequires:     ncurses-static}

+BuildRequires: texinfo
+Requires(post,preun):  grep
+Requires(preun):       fileutils

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     zsh-doc-html, zsh-doc-ps, zsh-doc-dvi
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     zsh-doc-html, zsh-doc-ps, zsh-doc-dvi
 


@@ -39,42 +45,90 @@ Obsoletes:  zsh-doc-html, zsh-doc-ps, zsh-doc-dvi
 zsh is an enhanced version of the Bourne shell with csh additions and
 most features of ksh, bash, and tcsh.
 
 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 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
 %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
+Requires:      %{name} = %{version}

 
 %description completions
 This package contains files needed for advanced tab completion in zsh.
 
 
 %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
 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):   Zaawansowany bourne SHell - linkowany statycznie
+Group:         Applications/Shells
+Requires(post,preun):  grep
+Requires(preun):       fileutils
+Requires:      %{name} = %{version}

 
 %description static
 zsh is an enhanced version of the Bourne shell with csh additions and
 most features of ksh, bash, and tcsh.
 
 
 %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.
 
 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.
 

+%package guide
+Summary:       A User's Guide to the Z-Shell
+Summary(pl):   Podrêcznik U¿ytkownika Z-Shella
+Group:         Applications/Shells
+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
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1


@@ -82,9 +136,12 @@ linkowany.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+%patch5 -p1
+
+install %{SOURCE2} .

 
 %build
 
 %build

-autoconf
+%{__autoconf}

 
 %if %{!?_without_static:1}%{?_without_static:0}
 LDFLAGS="%{rpmldflags} -static"
 
 %if %{!?_without_static:1}%{?_without_static:0}
 LDFLAGS="%{rpmldflags} -static"


@@ -98,7 +155,8 @@ LDFLAGS="%{rpmldflags}"
        --enable-maildir-support
 %{__make}
 
        --enable-maildir-support
 %{__make}
 

-(cd Doc; makeinfo zsh.texi)
+cd Doc
+makeinfo zsh.texi

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -110,17 +168,36 @@ install -d $RPM_BUILD_ROOT{%{_infodir},%{_sysconfdir},%{_bindir},%{_mandir}/pl/m
 install Doc/zsh.info*  $RPM_BUILD_ROOT%{_infodir}
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{zlogout,zlogin,zshenv}
 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
+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
+alias which=whence
+
+# xterm
+bindkey \`tput khome\` beginning-of-line >/dev/null 2>&1
+bindkey \`tput kend\` end-of-line >/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
+EOF

 
 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
 
 
 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
 

-gzip -9nf Etc/* README LICENCE ChangeLog META-FAQ
+# for kdesdk's completion
+ln -sf %{version} $RPM_BUILD_ROOT%{_datadir}/zsh/latest
+
+%clean
+rm -rf $RPM_BUILD_ROOT

 
 %post
 
 %post

+umask 022

 if [ ! -f /etc/shells ]; then
        echo "%{_bindir}/zsh" >> /etc/shells
 else
 if [ ! -f /etc/shells ]; then
        echo "%{_bindir}/zsh" >> /etc/shells
 else


@@ -130,6 +207,7 @@ fi
 
 %preun
 if [ "$1" = "0" ]; then
 
 %preun
 if [ "$1" = "0" ]; then

+       umask 022

        grep -v '^%{_bindir}/zsh$' /etc/shells > /etc/shells.new
        mv -f /etc/shells.new /etc/shells
 fi
        grep -v '^%{_bindir}/zsh$' /etc/shells > /etc/shells.new
        mv -f /etc/shells.new /etc/shells
 fi


@@ -138,36 +216,35 @@ fi
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
 
 %post static
 [ ! -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
 if [ ! -f /etc/shells ]; then

-       echo "%{_bindir}/zsh.static" >> /etc/shells
+       echo "%{_bindir}/zsh.static" >> /etc/shells

 else
 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
 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
 
 fi
 

-
-%clean
-rm -rf $RPM_BUILD_ROOT
-

 %files
 %defattr(644,root,root,755)
 %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
 %attr(755,root,root) %{_bindir}/zsh

-%config %{_sysconfdir}/*
+%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/*

 %dir %{_libdir}/zsh
 %dir %{_libdir}/zsh/%{version}
 %dir %{_libdir}/zsh
 %dir %{_libdir}/zsh/%{version}

-%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh

 %dir %{_datadir}/zsh/site-functions
 %dir %{_datadir}/zsh/site-functions

+%{_datadir}/zsh/latest

 %dir %{_datadir}/zsh/%{version}
 %dir %{_datadir}/zsh/%{version}/functions
 %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*
 %attr(755,root,root) %{_libdir}/zsh/%{version}/*
 %{_infodir}/zsh.info*
 %{_mandir}/man1/zsh*.1*


@@ -178,7 +255,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/zsh/%{version}/functions/comp*
 %{_datadir}/zsh/%{version}/functions/_*
 
 %{_datadir}/zsh/%{version}/functions/comp*
 %{_datadir}/zsh/%{version}/functions/_*
 

+%files guide
+%defattr(644,root,root,755)
+%doc zshguide.pdf
+

 %if %{!?_without_static:1}%{?_without_static:0}
 %files static
 %if %{!?_without_static:1}%{?_without_static:0}
 %files static

+%defattr(644,root,root,755)

 %attr(755,root,root) %{_bindir}/zsh.static
 %endif
 %attr(755,root,root) %{_bindir}/zsh.static
 %endif