- force mv

[packages/zsh.git] / zsh.spec

diff --git a/zsh.spec b/zsh.spec
index 9e8d98d1d540e4cbcc0d6601eb946ff6ca6e90ba..37f1426f5ebc8fae327d039ab0196224d7f3a35d 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -15,16 +15,15 @@ Summary(ru.UTF-8):  Командный процессор (shell) похожый
 Summary(tr.UTF-8):     Gelişmiş bir BASH sürümü
 Summary(uk.UTF-8):     Командний процесор (shell) схожий на ksh, але з покращеннями
 Name:          zsh
-Version:       4.3.2
-Release:       2
+Version:       4.3.9
+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: e13fc4bb338fbb27ef7508a474310c8f
+# Source0-md5: 0539d0a590e545ad8c40ff8c97e94538
 Source1:       %{name}.1.pl
 Source2:       http://zsh.sunsite.dk/Guide/%{name}guide.pdf
-# Source2-md5: 0d80ba1ef39052c512cfabf368f3bf20
+# Source2-md5: e42b6b6ff487bb2a95543f3937287b99
 Source3:       zprofile
 Source4:       %{name}rc
 Patch0:                %{name}-info.patch
@@ -32,15 +31,16 @@ Patch1:             %{name}-addons.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-completions.patch
 Patch4:                %{name}-nolibs.patch
-Patch5:                %{name}-autoconf.patch
-Patch6:                %{name}-lfs.patch
+URL:           http://www.zsh.org/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: findutils
 %{?with_static:BuildRequires:  glibc-static}
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel >= 5.1
 %{?with_static:BuildRequires:  ncurses-static}
 BuildRequires: pcre-devel
+BuildRequires: rpmbuild(macros) >= 1.470
 BuildRequires: texinfo
 BuildRequires: yodl
 Requires(post,preun):  grep
@@ -145,22 +145,22 @@ Podręcznik Użytkownika Z-Shella.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 install %{SOURCE2} .
 
+find Functions -type f -exec sed -i -e 's|#!.*/zsh|#!/bin/zsh|g' "{}" ";"
+
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %{__autoheader}
 echo > stamp-h.in
-CPPFLAGS="-I/usr/include/ncurses $CPPFLAGS"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 
 %if %{with static}
 LDFLAGS="%{rpmldflags} -static"
@@ -216,12 +216,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 umask 022
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
 if [ ! -f /etc/shells ]; then
        echo "%{_bindir}/zsh" >> /etc/shells
 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
@@ -233,8 +233,8 @@ if [ "$1" = "0" ]; then
        mv -f /etc/shells.new /etc/shells
 fi
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
+%postun        -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post static
 umask 022