- up to 4.3 (pl.po looks up to date, so disable patch)

diff --git a/bash-autoconf.patch b/bash-autoconf.patch
index 210a29c25d96b085981fcc09c9c16f5e5e6bb8c7..59e9d2315d16d560d2a41d22afaf9195e15e2f36 100644 (file)
--- a/bash-autoconf.patch
+++ b/bash-autoconf.patch
@@ -17,14 +17,15 @@
  AC_MSG_CHECKING(which library has the termcap functions)
 --- bash-2.05a-new/Makefile.in Fri Feb  8 00:20:46 2002
 +++ bash-2.05a/Makefile.in     Thu Feb  7 22:38:32 2002
-@@ -592,8 +592,8 @@
-       $(SHELL) ./config.status --recheck
+@@ -727,8 +727,8 @@ pathnames.h:               Makefile $(srcdir)/pathnam
+       @${RM} pathnames.tmp
  
  # comment out for distribution
--$(srcdir)/configure:  $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
+-$(srcdir)/configure:  $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
 -      cd $(srcdir) && autoconf
-+#$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
++#$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
 +#     cd $(srcdir) && autoconf
  
  # for chet
  reconfig: force
+

diff --git a/bash-paths.patch b/bash-paths.patch
index cc3483382e705a5b0ddee6e9b712947c8190c63f..dbd44b8a66f9c105681869cadadfd13dd7f2b2b4 100644 (file)
--- a/bash-paths.patch
+++ b/bash-paths.patch
@@ -14,11 +14,11 @@ Tylko w bash-3.0: config.h.in.orig
 diff -urbB bash-3.0.org/config-top.h bash-3.0/config-top.h
 --- bash-3.0.org/config-top.h  2003-08-05 16:36:12.000000000 +0200
 +++ bash-3.0/config-top.h      2005-10-08 19:36:04.395581500 +0200
-@@ -52,14 +52,14 @@
+@@ -59,14 +59,14 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
  #define DEFAULT_PATH_VALUE \
--  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
+-  "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
 +  "/usr/local/bin:/bin:/usr/bin"
  #endif
  

diff --git a/bash.spec b/bash.spec
index feef2c555a3208f4fa298eb35f9eb5a2e01ddf47..f1011f0d64d294ac6f079b8fc062da59dca771fd 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -3,9 +3,9 @@
 %bcond_with    bash_history    # build with additional history in /var/log/bash_hist ;)
 %bcond_without tests   # do not perform "make test"
 
-%define                ver             4.2
-%define                patchlevel      45
-%define                rel             2
+%define                ver             4.3
+%define                patchlevel      0
+%define                rel             1
 Summary:       GNU Bourne Again Shell (bash)
 Summary(fr.UTF-8):     Le shell Bourne Again de GNU
 Summary(pl.UTF-8):     Powłoka GNU Bourne Again Shell (bash)
@@ -15,7 +15,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: 3fb927c7c33022f1c327f14a81c0d4b0
+# Source0-md5: 81348932d5da294953e15d4814c74dd1
 Source1:       %{name}rc
 Source2:       %{name}-skel-.bash_logout
 Source3:       %{name}-skel-.bash_profile
@@ -34,15 +34,13 @@ Patch9:             %{name}-backup_history.patch
 Patch10:       %{name}-act_like_sh.patch
 Patch11:       %{name}-elinks_cont.patch
 Patch12:       %{name}-pl.po-update.patch
-Patch13:       %{name}-format-string.patch
-Patch14:       %{name}-4.2-missing_closes.patch
-%patchset_source -f http://ftp.gnu.org/gnu/bash/bash-4.2-patches/bash42-%03g 1 %{patchlevel}
+%patchset_source -f http://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-%03g 1 %{patchlevel}
 URL:           http://www.gnu.org/software/bash/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: ncurses-devel >= 5.2
-BuildRequires: readline-devel >= 6.2
+BuildRequires: readline-devel >= 6.3
 BuildRequires: rpmbuild(macros) >= 1.462
 BuildRequires: sed >= 4.0
 BuildRequires: texinfo
@@ -50,9 +48,9 @@ BuildRequires:        texinfo
 # Require static library only for static build
 BuildRequires: glibc-static >= 2.2
 BuildRequires: ncurses-static >= 5.2
-BuildRequires: readline-static >= 6.2
+BuildRequires: readline-static >= 6.3
 %endif
-Requires:      readline >= 6.2
+Requires:      readline >= 6.3
 Requires:      setup >= 2.4.6-2
 Obsoletes:     bash-doc
 Obsoletes:     bash2
@@ -193,9 +191,7 @@ tym pakiecie jest wersja basha skonsolidowana statycznie.
 %{?with_bash_history:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
+#%patch12 -p1
 
 %build
 cp -f /usr/share/automake/config.* support