X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=zsh.spec;h=097ea7768db506847b68bb32313bdb9e2d521da1;hb=8b0be83c4fae68bb569dcc41c62be745328958b6;hp=4a66bc2abd05afeb71d3966ab8ea147a91c908ed;hpb=9e3b691c934c439ad872f991493a41df0276db63;p=packages%2Fzsh.git diff --git a/zsh.spec b/zsh.spec index 4a66bc2..097ea77 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,8 +1,8 @@ # # 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é @@ -12,39 +12,40 @@ Summary(ru): Summary(tr): Geliþmiþ bir BASH sürümü Summary(uk): ëÏÍÁÎÄÎÉÊ ÐÒÏÃÅÓÏÒ (shell) ÓÈÏÖÉÊ ÎÁ ksh, ÁÌÅ Ú ÐÏËÒÁÝÅÎÎÑÍÉ Name: zsh -Version: 4.1.1 -Release: 3 +Version: 4.2.5 +Release: 1 License: BSD-like Group: Applications/Shells URL: http://www.zsh.org/ -Source0: ftp://ftp.zsh.org/pub/zsh/%{name}-%{version}.tar.bz2 -# Source0-md5: 48958b1a3fc86261a26eea40a4f7d4af +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 -Patch5: %{name}-completions.patch -Patch6: %{name}-zle_misc.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 BuildRequires: autoconf -%{!?_without_static:BuildRequires: glibc-static} +%{?with_static:BuildRequires: glibc-static} BuildRequires: libcap-devel BuildRequires: ncurses-devel >= 5.1 -%{!?_without_static:BuildRequires: ncurses-static} +%{?with_static:BuildRequires: ncurses-static} BuildRequires: pcre-devel BuildRequires: texinfo -PreReq: grep -PreReq: fileutils Requires(post,preun): grep Requires(preun): fileutils -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +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" +%define specflags_ia32 -fomit-frame-pointer %description zsh is an enhanced version of the Bourne shell with csh additions and @@ -96,7 +97,8 @@ shell- Summary: Files needed for advanced TAB-completion Summary(pl): Pliki potrzebne dla zaawansowanej TAB-completion Group: Applications/Shells -Requires: %{name} = %{version} +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. @@ -106,12 +108,12 @@ 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 -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description static zsh is an enhanced version of the Bourne shell with csh additions and @@ -119,13 +121,13 @@ 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 Summary(pl): Podrêcznik U¿ytkownika Z-Shella -Group: Applications/Shells +Group: Documentation URL: http://zsh.sunsite.dk/Guide/ %description guide @@ -147,18 +149,26 @@ Podr install %{SOURCE2} . %build +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 @@ -171,27 +181,13 @@ install -d $RPM_BUILD_ROOT{%{_infodir},%{_sysconfdir},%{_bindir},%{_mandir}/pl/m %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{!?_without_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 "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 +%{?with_static:install Src/zsh.static $RPM_BUILD_ROOT%{_bindir}} +install Doc/zsh.info* $RPM_BUILD_ROOT%{_infodir} -# 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 +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 @@ -211,6 +207,9 @@ 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 @@ -241,7 +240,8 @@ fi %defattr(644,root,root,755) %doc Etc/* README LICENCE ChangeLog META-FAQ Util StartupFiles %attr(755,root,root) %{_bindir}/zsh -%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/* +%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/*[!w]? +%ghost %{_sysconfdir}/*.zwc %dir %{_libdir}/zsh %dir %{_libdir}/zsh/%{version} %dir %{_datadir}/zsh @@ -266,7 +266,7 @@ fi %defattr(644,root,root,755) %doc zshguide.pdf -%if %{!?_without_static:1}%{?_without_static:0} +%if %{with static} %files static %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/zsh.static