- rel 2

[packages/zsh.git] / zsh.spec

diff --git a/zsh.spec b/zsh.spec
index a11db65014a4ad5a2e962d57c7df578dfb5c982f..bd0d8399af3a9e8b7d1c9a4d7583134c9fc8efdd 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,47 +1,53 @@
 #
 #

+# todo:
+# - add zsh-lovers man page from http://grml.org/zsh/
+#

 # Conditional build:
 # Conditional build:

-%bcond_without  static # without static version
+%bcond_with    static # build 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(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, ÁÌÅ Ú ÐÏËÒÁÝÅÎÎÑÍÉ
+Summary(de.UTF-8):     Enhanced Bourne Shell
+Summary(es.UTF-8):     Shell bourne mejorada
+Summary(fr.UTF-8):     Bourne shell amélioré
+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
 Name:          zsh

-Version:       4.2.5
-Release:       0.1
+Version:       4.3.5
+Release:       2

 License:       BSD-like
 Group:         Applications/Shells
 URL:           http://www.zsh.org/
 Source0:       ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
 License:       BSD-like
 Group:         Applications/Shells
 URL:           http://www.zsh.org/
 Source0:       ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2

-# Source0-md5: e2060f743dcdf3b383e80e862a6548fe
+# Source0-md5: db0d4b71da8e5877fa1e29d4cea38b8c

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

-Source2:       http://zsh.sunsite.dk/Guide/zshguide.pdf
-# Source2-md5: 0d80ba1ef39052c512cfabf368f3bf20
+Source2:       http://zsh.sunsite.dk/Guide/%{name}guide.pdf
+# Source2-md5: e42b6b6ff487bb2a95543f3937287b99

 Source3:       zprofile
 Source3:       zprofile

-Source4:       zshrc
+Source4:       %{name}rc

 Patch0:                %{name}-info.patch
 Patch1:                %{name}-addons.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-completions.patch
 Patch4:                %{name}-nolibs.patch
 Patch0:                %{name}-info.patch
 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
+Patch5:                %{name}-lfs.patch

 BuildRequires: autoconf
 BuildRequires: autoconf

+BuildRequires: automake

 %{?with_static:BuildRequires:  glibc-static}
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel >= 5.1
 %{?with_static:BuildRequires:  ncurses-static}
 BuildRequires: pcre-devel
 BuildRequires: texinfo
 %{?with_static:BuildRequires:  glibc-static}
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel >= 5.1
 %{?with_static:BuildRequires:  ncurses-static}
 BuildRequires: pcre-devel
 BuildRequires: texinfo

+BuildRequires: yodl

 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      findutils
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      findutils

-Obsoletes:     zsh-doc-html, zsh-doc-ps, 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _bindir         /bin


@@ -51,51 +57,51 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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,
+%description -l es.UTF-8
+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,
 - 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-ÆÕÎËæ§ (Ú Á×ÔÏÚÁ×ÁÎÔÁÖÅÎÎÑÍ), ¦ÓÔÏÒ¦À ËÏÍÁÎÄ ÔÁ ÂÁÇÁÔÏ ¦ÎÛÏÇÏ.
+- selección,
+- funciones shell ...y mucho más.
+
+%description -l ja.UTF-8
+zsh ã\82·ã\82§ã\83«ã\81¯å¯¾è©±ç\9a\84ã\81ªã\83­ã\82°ã\82¤ã\83³ã\82·ã\82§ã\83«ã\81¨ã\81\97ã\81¦å\88©ç\94¨å\8f¯è\83½ã\81ªã\82³ã\83\9eã\83³ã\83\89ã\82¤ã\83³ã\82¿ã\83ªã\82¿
+であり、シェルスクリプトコマンドも処理できます. zsh は ksh(the Korn
+shell) に似ていますが,かなり拡張されています. zsh
+はコマンドラインでの編集機能, 組み込まれたスペル修正機能, プログラミン
+グ可能なコマンド補完機能, (動的ロードされる)シェル機能, ヒストリ機構
+などを持ちます.
+
+%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.
+
+%description -l pt_BR.UTF-8
+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.UTF-8
+zsh - это командный процессор напоминающий ksh (Korn shell), но
+включающий много улучшений. zsh поддерживает редактирование командной
+строки, встроенную коррекцию написания, программируемое завершение
+команд, shell-функции (с автозагрузкой), историю команд и многое
+другое.
+
+%description -l uk.UTF-8
+zsh - це командний процесор, що нагадує ksh (Korn shell), але включає
+багато покращень. zsh підтримує редагування командного рядка,
+вбудовану корекцію написання, програмоване завершення команд,
+shell-функції (з автозавантаженням), історію команд та багато іншого.

 
 %package completions
 Summary:       Files needed for advanced TAB-completion
 
 %package completions
 Summary:       Files needed for advanced TAB-completion

-Summary(pl):   Pliki potrzebne dla zaawansowanej TAB-completion
+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}
 Group:         Applications/Shells
 Conflicts:     kdesdk-completions-zsh <= 3:3.2.3-2
 Requires:      %{name} = %{version}-%{release}


@@ -103,13 +109,13 @@ Requires: %{name} = %{version}-%{release}
 %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 completions -l pl
+%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
 Ten pakiet zawiera pliki wymagane przez zsh dla zaawansowanej
 TAB-completion.
 
 %package static
 Summary:       Statically linked Enhanced Bourne shell

-Summary(pl):   Zaawansowana pow³oka Bourne'a - skonsolidowana statycznie
+Summary(pl.UTF-8):     Zaawansowana powłoka Bourne'a - skonsolidowana statycznie

 Group:         Applications/Shells
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Group:         Applications/Shells
 Requires(post,preun):  grep
 Requires(preun):       fileutils


@@ -119,43 +125,49 @@ Requires: %{name} = %{version}-%{release}
 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 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 wersja
+%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

 skonsolidowana statycznie.
 
 %package guide
 Summary:       A User's Guide to the Z-Shell
 skonsolidowana statycznie.
 
 %package guide
 Summary:       A User's Guide to the Z-Shell

-Summary(pl):   Podrêcznik U¿ytkownika Z-Shella
+Summary(pl.UTF-8):     Podręcznik Użytkownika Z-Shella

 Group:         Documentation
 URL:           http://zsh.sunsite.dk/Guide/
 
 %description guide
 A User's Guide to the Z-Shell.
 
 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.
+%description guide -l pl.UTF-8
+Podręcznik Użytkownika Z-Shella.

 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
+#%patch0 -p1

 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

-%patch6 -p0

 
 install %{SOURCE2} .
 
 
 install %{SOURCE2} .
 

+sed -i -e 's|#!.*/zsh|#!/bin/zsh|g' Functions/*/*
+

 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}

-CPPFLAGS="-I/usr/include/ncurses"
+%{__autoheader}
+echo > stamp-h.in
+CPPFLAGS="-I/usr/include/ncurses $CPPFLAGS"

 
 %if %{with static}
 LDFLAGS="%{rpmldflags} -static"
 %configure \
 
 %if %{with static}
 LDFLAGS="%{rpmldflags} -static"
 %configure \

+       --enable-maildir-support \
+       --enable-multibyte \
+       --with-tcsetpgrp \

        --disable-dynamic
 %{__make} \
        DLLDFLAGS=""
        --disable-dynamic
 %{__make} \
        DLLDFLAGS=""


@@ -167,8 +179,11 @@ LDFLAGS="%{rpmldflags}"
 %configure \
        ac_cv_have_dev_ptmx=yes \
        --enable-maildir-support \
 %configure \
        ac_cv_have_dev_ptmx=yes \
        --enable-maildir-support \

+       --enable-cap \

        --enable-pcre \
        --enable-pcre \

-       --enable-cap
+       --enable-multibyte \
+       --with-curses-terminfo \
+       --with-tcsetpgrp

 %{__make}
 
 cd Doc
 %{__make}
 
 cd Doc


@@ -201,12 +216,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 umask 022
 
 %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
 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
 for i in zlogin zlogout zprofile zshenv zshrc; do
        [ -f /etc/$i ] && zsh -c "zcompile /etc/$i"
 done


@@ -218,8 +233,8 @@ if [ "$1" = "0" ]; then
        mv -f /etc/shells.new /etc/shells
 fi
 
        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
 
 %post static
 umask 022


@@ -243,24 +258,26 @@ fi
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/*[!w]?
 %ghost %{_sysconfdir}/*.zwc
 %dir %{_libdir}/zsh
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/*[!w]?
 %ghost %{_sysconfdir}/*.zwc
 %dir %{_libdir}/zsh

-%dir %{_libdir}/zsh/%{version}
+%dir %{_libdir}/zsh/%{version}*

 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/latest
 %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]*
-%attr(755,root,root) %{_libdir}/zsh/%{version}/*
+%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]*
+%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)
 %{_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/_*
+%{_datadir}/zsh/%{version}*/functions/comp*
+%{_datadir}/zsh/%{version}*/functions/_*

 
 %files guide
 %defattr(644,root,root,755)
 
 %files guide
 %defattr(644,root,root,755)