diff --git a/bash-68ab281e3057242777c1bbb92c916aea1d134b7d.tar.gz b/bash-5.2.9.tar.gz similarity index 51% rename from bash-68ab281e3057242777c1bbb92c916aea1d134b7d.tar.gz rename to bash-5.2.9.tar.gz index 95b3480aeff9ee59d4b021c1b7be06ce2fb21a62..9f2c6f42d6b15abff9a0f9f3cc47a4806847a548 100644 Binary files a/bash-68ab281e3057242777c1bbb92c916aea1d134b7d.tar.gz and b/bash-5.2.9.tar.gz differ diff --git a/bash.spec b/bash.spec index 7f10b9363b9b08596f7281f37eee96df85f27d08..d45d3efddb557d26a8f50b6d7b4d55d0db092250 100644 --- a/bash.spec +++ b/bash.spec @@ -1,21 +1,33 @@ -%global bashver 5.2-alpha -%global bashhash 68ab281e3057242777c1bbb92c916aea1d134b7d +%define anolis_release 1 Name: bash -Version: 5.2~alpha -Release: 2%{?dist} +Version: 5.2.9 +Release: %{anolis_release}%{?dist} Summary: The GNU Bourne Again shell License: GPLv3+ URL: https://www.gnu.org/software/bash -#Source0: https://ftp.gnu.org/gnu/bash/bash-%{bashver}.tar.gz -Source0: https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-%{bashhash}.tar.gz +Source0: https://ftp.gnu.org/gnu/bash/%{name}-%{version}.tar.gz Source1: dot-bashrc Source2: dot-bash_profile Source3: dot-bash_logout -BuildRequires: gcc make texinfo bison ncurses-devel autoconf gettext glibc-all-langpacks coreutils util-linux +BuildRequires: gcc +BuildRequires: texinfo +BuildRequires: bison +BuildRequires: ncurses-devel +BuildRequires: readline-devel >= 8.2 +BuildRequires: autoconf +BuildRequires: gettext-devel +BuildRequires: make +# Required for bash tests +BuildRequires: glibc-all-langpacks Requires: filesystem +# Per requested by upstream +# https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00105.html +Requires: readline >= 8.2 +Requires(post): lua +Requires(postun): lua Provides: /bin/sh /bin/bash %description @@ -26,30 +38,32 @@ incorporates useful features from the Korn shell (ksh) and the C shell %package devel Summary: Development headers for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel This package contains development headers for %{name}. %package doc Summary: Documentation files for %{name} +Buildarch: noarch Requires: %{name} = %{version}-%{release} %description doc This package contains documentation files for %{name}. %prep -%autosetup -p1 -n bash-%{bashhash} +%autosetup -p1 -n bash-%{version} %build autoconf -%configure --with-bash-malloc=no --with-afs +%configure --with-bash-malloc=no --with-afs \ + --without-included-gettext \ + --enable-readline --with-installed-readline make version.h -make %{?_smp_mflags} -C builtins -make %{?_smp_mflags} +%make_build -C builtins +%make_build %install -rm -rf $RPM_BUILD_ROOT %make_install install-headers ln -sf bash %{buildroot}%{_bindir}/sh @@ -148,6 +162,9 @@ end %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Dec 2 2022 Funda Wang - 5.2.9-1 +- New version 5.2.9 + * Mon Mar 21 2022 forrest_ly - 5.2~alpha-2 - Fix some bugs from upstream