- 4.3 snap

Changed files:
    zsh.spec -> 1.119

diff --git a/zsh.spec b/zsh.spec
index 0f648f2532054a772bbb0cdbbe651c634ea1aff3..dc02631a9c4b44406b159ab2ba6c421335dfa14a 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -12,13 +12,14 @@ Summary(ru):        
 Summary(tr):   Geliþmiþ bir BASH sürümü
 Summary(uk):   ëÏÍÁÎÄÎÉÊ ÐÒÏÃÅÓÏÒ (shell) ÓÈÏÖÉÊ ÎÁ ksh, ÁÌÅ Ú ÐÏËÒÁÝÅÎÎÑÍÉ
 Name:          zsh
-Version:       4.2.5
-Release:       1
+%define        snap    20050915
+Version:       4.3.0
+Release:       0.%{snap}.1
 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:       %{name}-%{snap}.tar.gz
+# Source0-md5: 5e787c3ba7a928782dbad1926b66382e
 Source1:       %{name}.1.pl
 Source2:       http://zsh.sunsite.dk/Guide/zshguide.pdf
 # Source2-md5: 0d80ba1ef39052c512cfabf368f3bf20
@@ -38,6 +39,7 @@ 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
@@ -137,20 +139,22 @@ A User's Guide to the Z-Shell.
 Podrêcznik U¿ytkownika Z-Shella.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p0
+#%patch5 -p1
+#%patch6 -p0
 
 install %{SOURCE2} .
 
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
+%{__autoheader}
+echo > stamp-h.in
 CPPFLAGS="-I/usr/include/ncurses"
 
 %if %{with static}
@@ -168,7 +172,8 @@ LDFLAGS="%{rpmldflags}"
        ac_cv_have_dev_ptmx=yes \
        --enable-maildir-support \
        --enable-pcre \
-       --enable-cap
+       --enable-cap \
+       --enable-multibyte
 %{__make}
 
 cd Doc
@@ -243,24 +248,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)