SPECS: zsh.spec - ups

[arekm]

Author: arekm                        Date: Thu Sep 15 21:24:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ups

---- Files affected:
SPECS:
   zsh.spec (1.119 -> 1.120) 

---- Diffs:

================================================================
Index: SPECS/zsh.spec
diff -u SPECS/zsh.spec:1.119 SPECS/zsh.spec:1.120
--- SPECS/zsh.spec:1.119	Thu Sep 15 23:23:31 2005
+++ SPECS/zsh.spec	Thu Sep 15 23:24:04 2005
@@ -13,14 +13,13 @@
 Summary(tr):	Geliţmiţ bir BASH sürümü
 Summary(uk):	ëĎÍÁÎÄÎÉĘ ĐŇĎĂĹÓĎŇ (shell) ÓČĎÖÉĘ ÎÁ ksh, ÁĚĹ Ú ĐĎËŇÁÝĹÎÎŃÍÉ
 Name:		zsh
-%define	snap	20050915
-Version:	4.3.0
-Release:	0.%{snap}.1
+Version:	4.2.5
+Release:	1
 License:	BSD-like
 Group:		Applications/Shells
 URL:		http://www.zsh.org/
-Source0:	%{name}-%{snap}.tar.gz
-# Source0-md5:	5e787c3ba7a928782dbad1926b66382e
+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
@@ -40,7 +39,6 @@
 %{?with_static:BuildRequires:	ncurses-static}
 BuildRequires:	pcre-devel
 BuildRequires:	texinfo
-BuildRequires:	yodl
 Requires(post,preun):	grep
 Requires(preun):	fileutils
 Requires:	findutils
@@ -140,22 +138,20 @@
 Podręcznik Użytkownika Z-Shella.
 
 %prep
-%setup -q -n %{name}
-#%patch0 -p1
+%setup -q
+%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}
@@ -173,8 +169,7 @@
 	ac_cv_have_dev_ptmx=yes \
 	--enable-maildir-support \
 	--enable-pcre \
-	--enable-cap \
-	--enable-multibyte
+	--enable-cap
 %{__make}
 
 cd Doc
@@ -249,26 +244,24 @@
 %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}*/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}*/*
+%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}/*
 %{_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)
@@ -286,8 +279,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.119  2005/09/15 21:23:31  arekm
-- 4.3 snap
+Revision 1.120  2005/09/15 21:24:04  arekm
+- ups
 
 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.119&r2=1.120&f=u