- /usr/share/bash/* are doc; rel 3

[packages/bash.git] / bash.spec

diff --git a/bash.spec b/bash.spec
index 00b2be61ddf8ef56a66a3cf7bfe04e608f617f63..2730a56600bc4890979f343eedf9dcd4f04a3a25 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -4,8 +4,8 @@
 %bcond_with    bash_history    # build with additional history in /var/log/bash_hist ;)
 %bcond_without tests   # do not perform "make test"
 #
-%define                ver             3.2
-%define                patchlevel      48
+%define                ver             4.1
+%define                patchlevel      0
 %define                rel             3
 Summary:       GNU Bourne Again Shell (bash)
 Summary(fr.UTF-8):     Le shell Bourne Again de GNU
@@ -16,7 +16,7 @@ Release:      %{rel}%{?with_bash_history:inv}
 License:       GPL
 Group:         Applications/Shells
 Source0:       http://ftp.gnu.org/gnu/bash/%{name}-%{ver}.tar.gz
-# Source0-md5: 00bfa16d58e034e3c2aa27f390390d30
+# Source0-md5: 9800d8724815fd84994d9be65ab5e7b8
 Source1:       %{name}rc
 Source2:       %{name}-skel-.%{name}_logout
 Source3:       %{name}-skel-.%{name}_profile
@@ -37,13 +37,13 @@ Patch8:             %{name}-sighup.patch
 Patch9:                %{name}-backup_history.patch
 Patch10:       %{name}-act_like_sh.patch
 Patch11:       %{name}-elinks_cont.patch
-%patchset_source -f http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-%03g 1 %{patchlevel}
+#%%patchset_source -f http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-%03g 1 %{patchlevel}
 URL:           http://www.gnu.org/software/bash/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: ncurses-devel >= 5.2
-BuildRequires: readline-devel >= 5.2
+BuildRequires: readline-devel >= 6.1
 BuildRequires: rpmbuild(macros) >= 1.462
 BuildRequires: sed >= 4.0
 BuildRequires: texinfo
@@ -51,9 +51,9 @@ BuildRequires:        texinfo
 # Require static library only for static build
 BuildRequires: glibc-static >= 2.2
 BuildRequires: ncurses-static >= 5.2
-BuildRequires: readline-static >= 5.2
+BuildRequires: readline-static >= 6.1
 %endif
-Requires:      readline >= 5.2
+Requires:      readline >= 6.1
 Requires:      setup >= 2.4.6-2
 Obsoletes:     bash-doc
 Obsoletes:     bash2
@@ -182,7 +182,7 @@ tym pakiecie jest wersja basha skonsolidowana statycznie.
 %prep
 %setup -q -n %{name}-%{ver} -a5
 # official patches
-%patchset_patch 1 %{patchlevel}
+#%%patchset_patch 1 %{patchlevel}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -301,7 +301,8 @@ end
 %lang(ko) %{_mandir}/ko/man1/*
 %lang(nl) %{_mandir}/nl/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%doc %{_datadir}/%{name}/*
 
 %if %{with static}
 %files static