SPECS: zsh.spec - merged from DEVEL

[arekm]

Author: arekm                        Date: Sat Mar  4 21:45:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   zsh.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/zsh.spec
diff -u SPECS/zsh.spec:1.123 SPECS/zsh.spec:1.124
--- SPECS/zsh.spec:1.123	Tue Dec 13 19:01:47 2005
+++ SPECS/zsh.spec	Sat Mar  4 22:45:27 2006
@@ -1,7 +1,10 @@
 # $Revision$, $Date$
 #
+# 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
@@ -13,13 +16,13 @@
 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
@@ -30,14 +33,15 @@
 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
@@ -140,23 +144,27 @@
 
 %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=""
@@ -168,8 +176,11 @@
 %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
@@ -244,24 +255,26 @@
 %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)
@@ -279,6 +292,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2006/03/04 21:45:27  arekm
+- merged from DEVEL
+
 Revision 1.123  2005/12/13 18:01:47  glen
 - adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
 
@@ -292,6 +308,45 @@
 
 Revision 1.120  2005/09/15 21:24:04  arekm
 - ups
+
+Revision 1.118.2.12  2006/03/03 20:39:00  wolf
+- 4.3.2
+
+Revision 1.118.2.11  2006/02/05 17:20:48  arekm
+- up to 20060205 snap
+
+Revision 1.118.2.10  2006/01/22 10:01:47  pluto
+- BR:automake for config.sub.
+
+Revision 1.118.2.9  2006/01/11 09:33:25  wrobell
+- todo added
+
+Revision 1.118.2.8  2005/12/16 08:52:24  arekm
+- more options
+
+Revision 1.118.2.7  2005/12/16 08:47:11  arekm
+- explictly set some configure options
+
+Revision 1.118.2.6  2005/12/16 08:14:23  arekm
+- up to snap 20051216.
+
+Revision 1.118.2.5  2005/11/24 10:28:23  pluto
+- static build disabled by default.
+
+Revision 1.118.2.4  2005/11/17 17:45:18  arekm
+- md5
+
+Revision 1.118.2.3  2005/11/17 17:33:39  arekm
+- up to snap 20051117
+
+Revision 1.118.2.2  2005/09/15 21:28:30  arekm
+- fix md5
+
+Revision 1.118.2.1  2005/09/15 21:24:22  arekm
+- 4.3 snap
+
+Revision 1.119  2005/09/15 21:23:31  arekm
+- 4.3 snap
 
 Revision 1.118  2005/08/11 09:46:18  radek
 - bcond_with(out) is followed by one \t, then bcond's name.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zsh.spec?r1=1.123&r2=1.124&f=u