- merged from DEVEL

Changed files:
    zsh.spec -> 1.124

diff --git a/zsh.spec b/zsh.spec
index b78765aa945ed71bf5165d020953e5ea90146b20..77ee952064b58dcf4dfdf459189a094b0e7bdfc1 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,6 +1,9 @@
 #
+# todo:
+# - add zsh-lovers man page from http://grml.org/zsh/
+#
 # Conditional build:
-%bcond_without static  # without static version
+%bcond_with    static # build static version
 #
 Summary:       Enhanced Bourne shell
 Summary(de):   Enhanced Bourne Shell
@@ -12,13 +15,13 @@ Summary(ru):        
 Summary(tr):   Geliþmiþ bir BASH sürümü
 Summary(uk):   ëÏÍÁÎÄÎÉÊ ÐÒÏÃÅÓÏÒ (shell) ÓÈÏÖÉÊ ÎÁ ksh, ÁÌÅ Ú ÐÏËÒÁÝÅÎÎÑÍÉ
 Name:          zsh
-Version:       4.2.6
+Version:       4.3.2
 Release:       1
 License:       BSD-like
 Group:         Applications/Shells
 URL:           http://www.zsh.org/
 Source0:       ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
-# Source0-md5: 2cefebf742c190cbc611baded825db64
+# Source0-md5: e13fc4bb338fbb27ef7508a474310c8f
 Source1:       %{name}.1.pl
 Source2:       http://zsh.sunsite.dk/Guide/%{name}guide.pdf
 # Source2-md5: 0d80ba1ef39052c512cfabf368f3bf20
@@ -29,14 +32,15 @@ Patch1:             %{name}-addons.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-completions.patch
 Patch4:                %{name}-nolibs.patch
-Patch5:                %{name}-broken_configure.patch
 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
+BuildRequires: yodl
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      findutils
@@ -139,23 +143,27 @@ Podr
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 install %{SOURCE2} .
 
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
+%{__autoheader}
+echo > stamp-h.in
 CPPFLAGS="-I/usr/include/ncurses"
 
 %if %{with static}
 LDFLAGS="%{rpmldflags} -static"
 %configure \
+       --enable-maildir-support \
+       --enable-multibyte \
+       --with-tcsetpgrp \
        --disable-dynamic
 %{__make} \
        DLLDFLAGS=""
@@ -167,8 +175,11 @@ LDFLAGS="%{rpmldflags}"
 %configure \
        ac_cv_have_dev_ptmx=yes \
        --enable-maildir-support \
+       --enable-cap \
        --enable-pcre \
-       --enable-cap
+       --enable-multibyte \
+       --with-curses-terminfo \
+       --with-tcsetpgrp
 %{__make}
 
 cd Doc
@@ -243,24 +254,26 @@ fi
 %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/%{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)
-%{_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)