- updated to 3.2

- dropped outdated pmake patch, removed bash31 patches, added po patch

Changed files:
    bash.spec -> 1.163

diff --git a/bash.spec b/bash.spec
index d17e74c4ac8d27ed7f3b1fa1f1d8e0e1238d7c50..9e1d6ff129d0741a82e1feccacc56bf48feac8b9 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -3,20 +3,20 @@
 %bcond_without static          # don't build static version
 %bcond_with    bash_history    # build with additional history in /var/log/bash_hist ;)
 ##
-%define                _ver            3.1
-%define                _patchlevel     017
-%define                _rel            1
+%define                _ver            3.2
+%define                _patchlevel     000
 #
 Summary:       GNU Bourne Again Shell (bash)
 Summary(fr):   Le shell Bourne Again de GNU
 Summary(pl):   Pow³oka GNU Bourne Again Shell (bash)
 Name:          bash
-Version:       %{_ver}.%{_patchlevel}
-Release:       %{_rel}%{?with_bash_history:inv}
+Version:       %{_ver}
+#.%{_patchlevel}
+Release:       1%{?with_bash_history:inv}
 License:       GPL
 Group:         Applications/Shells
-Source0:       ftp://ftp.gnu.org/pub/gnu/bash/%{name}-%{_ver}.tar.gz
-# Source0-md5: ef5304c4b22aaa5088972c792ed45d72
+Source0:       ftp://ftp.gnu.org/gnu/bash/%{name}-%{_ver}.tar.gz
+# Source0-md5: 00bfa16d58e034e3c2aa27f390390d30
 Source1:       %{name}rc
 Source2:       %{name}-skel-.%{name}_logout
 Source3:       %{name}-skel-.%{name}_profile
@@ -32,42 +32,25 @@ Patch5:             %{name}-requires.patch
 Patch6:                %{name}-compat.patch
 Patch8:                %{name}-sighup.patch
 Patch9:                %{name}-backup_history.patch
-Patch10:       %{name}-pmake.patch
+Patch10:       %{name}-po.patch
 Patch11:       %{name}-act_like_sh.patch
-Patch101:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001
-Patch102:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002
-Patch103:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003
-Patch104:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004
-Patch105:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005
-Patch106:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006
-Patch107:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007
-Patch108:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008
-Patch109:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009
-Patch110:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010
-Patch111:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011
-Patch112:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012
-Patch113:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013
-Patch114:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014
-Patch115:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015
-Patch116:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016
-Patch117:      ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017
 URL:           http://www.gnu.org/software/bash/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: ncurses-devel >= 5.2
-BuildRequires: readline-devel >= 5.1
+BuildRequires: readline-devel >= 5.2
 BuildRequires: texinfo
 %if %{with static}
 # Require static library only for static build
 BuildRequires: glibc-static >= 2.2
 BuildRequires: ncurses-static >= 5.2
-BuildRequires: readline-static >= 5.1
+BuildRequires: readline-static >= 5.2
 %endif
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      grep
-Requires:      readline >= 5.1
+Requires:      readline >= 5.2
 Requires:      setup >= 2.4.6-2
 Obsoletes:     bash-doc
 Obsoletes:     bash2
@@ -197,25 +180,6 @@ tym pakiecie jest wersja basha skonsolidowana statycznie.
 
 %prep
 %setup -q -n %{name}-%{_ver} -a5
-# official patches
-%patch101 -p0
-%patch102 -p0
-%patch103 -p0
-%patch104 -p0
-%patch105 -p0
-%patch106 -p0
-%patch107 -p0
-%patch108 -p0
-%patch109 -p0
-%patch110 -p0
-%patch111 -p0
-%patch112 -p0
-%patch113 -p0
-%patch114 -p0
-%patch115 -p0
-%patch116 -p0
-%patch117 -p0
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -225,12 +189,12 @@ tym pakiecie jest wersja basha skonsolidowana statycznie.
 %patch6 -p1
 %patch8 -p1
 %{?with_bash_history:%patch9 -p1}
-#%patch10 -p1  -- no longer needed?
+%patch10 -p1
 %patch11 -p1
 
 %build
-%{__autoconf}
 cp -f /usr/share/automake/config.* support
+%{__autoconf}
 for mode in %{?with_static:static} shared; do
 %configure \
        --enable-alias \