diff --git a/_service:download_files:bash-4.2.tar.gz b/_service:download_files:bash-4.2.tar.gz new file mode 100644 index 00000000..55a9b300 --- /dev/null +++ b/_service:download_files:bash-4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 +size 7009201 diff --git a/_service:download_files:readline-6.2.tar.gz b/_service:download_files:readline-6.2.tar.gz new file mode 100644 index 00000000..980dea6f --- /dev/null +++ b/_service:download_files:readline-6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 +size 2277926 diff --git a/bash-4.2-patches.tar.bz2 b/bash-4.2-patches.tar.bz2 index 96c2a757..81cdad88 100644 --- a/bash-4.2-patches.tar.bz2 +++ b/bash-4.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ebc79102e7f4e5eec2efa340c1bf52d0b0302f55c9d748d76da768255343244 -size 8428 +oid sha256:5f1bf907129dd4d5085472eb618aae814e29cb7906741fda01d0b2c519510ba3 +size 8767 diff --git a/bash-4.2.tar.bz2 b/bash-4.2.tar.bz2 deleted file mode 100644 index 525f811c..00000000 --- a/bash-4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:413ab72b6b17b5a0909b5462e94e2e81fc186f7766a99fdcbbef942da6a27148 -size 5126957 diff --git a/bash-4.2.tar.gz b/bash-4.2.tar.gz new file mode 100644 index 00000000..55a9b300 --- /dev/null +++ b/bash-4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 +size 7009201 diff --git a/bash.changes b/bash.changes index c33c9adc..e200aa40 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jun 17 11:43:00 UTC 2011 - coolo@novell.com + +- use original source URLs + +------------------------------------------------------------------- +Thu Jun 16 15:03:04 CEST 2011 - werner@suse.de + +- Fix the fix for bug bnc#681286 to be able to avoid both a not + expanding glob as well as the infinit loop in multi byte locale + ------------------------------------------------------------------- Thu May 12 12:04:28 CEST 2011 - werner@suse.de diff --git a/bash.spec b/bash.spec index 15e41e01..b287798b 100644 --- a/bash.spec +++ b/bash.spec @@ -40,8 +40,8 @@ Version: 4.2 Release: 4 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html -Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 -Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.gz Source2: bash-%{bash_vers}-patches.tar.bz2 Source3: readline-%{rl_vers}-patches.tar.bz2 Source4: run-tests @@ -85,6 +85,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _minsh 0 %{expand: %%global rl_major %(echo %{rl_vers} | sed -r 's/.[0-9]+//g')} + %description Bash is an sh-compatible command interpreter that executes commands read from standard input or from a file. Bash incorporates useful @@ -112,6 +113,7 @@ AutoReqProv: on BuildArch: noarch %endif + %description -n bash-doc This package contains the documentation for using the bourne shell interpreter Bash. @@ -126,6 +128,7 @@ Authors: %lang_package(bash) %else + %package -n bash-lang License: GPLv2+ Summary: Languages for package bash @@ -133,10 +136,12 @@ Group: System/Localization Provides: bash-lang = %{version} Requires: bash = %{version} + %description -n bash-lang Provides translations to the package bash %endif + %package -n bash-devel License: GPLv2+ Summary: Include Files mandatory for Development of bash loadable builtins @@ -145,6 +150,7 @@ Version: 4.2 Release: 4 AutoReqProv: on + %description -n bash-devel This package contains the C header files for writing loadable new builtins for the interpreter Bash. Use -I /usr/include/bash/ @@ -165,6 +171,7 @@ Version: 4.2 Release: 4 AutoReqProv: on + %description -n bash-loadables This package contains the examples for the ready-to-dynamic-load builtins found in the source tar ball of the bash: @@ -244,6 +251,7 @@ Provides: readline = 6.2 Obsoletes: readline <= 6.1 AutoReqProv: on + %description -n libreadline6 The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This @@ -275,6 +283,7 @@ Obsoletes: readline-devel-64bit %endif # + %description -n readline-devel This package contains all necessary include files and libraries needed to develop applications that require these. @@ -299,6 +308,7 @@ AutoReqProv: on BuildArch: noarch %endif + %description -n readline-doc This package contains the documentation for using the readline library as well as programming with the interface of the readline library. @@ -353,6 +363,7 @@ done %patch30 -p0 -b .destdir %patch20 -p0 -b .0 + %build LANG=POSIX LC_ALL=$LANG @@ -530,6 +541,7 @@ popd make -C examples/loadables/ make documentation + %install pushd ../readline-%{rl_vers}%{extend} make install htmldir=%{_defaultdocdir}/readline \ @@ -601,29 +613,37 @@ EOF %fdupes -s %{buildroot}%{_datadir}/bash/helpfiles %endif + %post -n bash-doc %install_info --info-dir=%{_infodir} %{_infodir}/bash.info.gz + %postun -n bash-doc %install_info_delete --info-dir=%{_infodir} %{_infodir}/bash.info.gz + %post -n libreadline6 -p /sbin/ldconfig + %postun -n libreadline6 -p /sbin/ldconfig + %post -n readline-doc %install_info --info-dir=%{_infodir} %{_infodir}/history.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/readline.info.gz + %postun -n readline-doc %install_info_delete --info-dir=%{_infodir} %{_infodir}/history.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz + %clean ldd -u -r %{buildroot}/bin/bash || true ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true %{?buildroot: %{__rm} -rf %{buildroot}} + %files %defattr(-,root,root) %config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history @@ -639,9 +659,11 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true %dir %{_datadir}/bash/helpfiles %{_datadir}/bash/helpfiles/* + %files -n bash-lang -f bash.lang %defattr(-,root,root) + %files -n bash-doc %defattr(-,root,root) %doc %{_infodir}/bash.info.gz @@ -651,6 +673,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true %doc %{_mandir}/man1/rbash.1.gz %doc %{_defaultdocdir}/bash/ + %files -n bash-devel %defattr(-,root,root) %dir /%{_includedir}/bash/ @@ -659,12 +682,14 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true /%{_incdir}/bash/%{bash_vers}/*.h /%{_incdir}/bash/%{bash_vers}/builtins/*.h + %files -n bash-loadables %defattr(-,root,root) %dir %{_ldldir}/ %dir %{_ldldir}/%{bash_vers}/ %{_ldldir}/%{bash_vers}/* + %files -n libreadline6 %defattr(-,root,root) /%{_lib}/libhistory.so.%{rl_major} @@ -672,6 +697,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true /%{_lib}/libreadline.so.%{rl_major} /%{_lib}/libreadline.so.%{rl_vers} + %files -n readline-devel %defattr(-,root,root) %{_incdir}/readline/ @@ -679,10 +705,13 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true %{_libdir}/libreadline.so %doc %{_mandir}/man3/readline.3.gz + %files -n readline-doc %defattr(-,root,root) %doc %{_infodir}/history.info.gz %doc %{_infodir}/readline.info.gz %doc %{_defaultdocdir}/readline/ + + %changelog diff --git a/readline-6.2.tar.bz2 b/readline-6.2.tar.bz2 deleted file mode 100644 index b69da543..00000000 --- a/readline-6.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:268b150ec7ed945b56b0b12391c612129effb080bbb1b38be86936630c2a4328 -size 1884298 diff --git a/readline-6.2.tar.gz b/readline-6.2.tar.gz new file mode 100644 index 00000000..980dea6f --- /dev/null +++ b/readline-6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 +size 2277926