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.spec b/bash.spec index b287798b..6b992b75 100644 --- a/bash.spec +++ b/bash.spec @@ -37,7 +37,7 @@ Recommends: bash-doc = %bash_vers %endif AutoReqProv: on Version: 4.2 -Release: 4 +Release: 5 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.gz @@ -85,7 +85,6 @@ 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 @@ -107,13 +106,12 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 -Release: 4 +Release: 5 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch %endif - %description -n bash-doc This package contains the documentation for using the bourne shell interpreter Bash. @@ -128,7 +126,6 @@ Authors: %lang_package(bash) %else - %package -n bash-lang License: GPLv2+ Summary: Languages for package bash @@ -136,21 +133,18 @@ 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 Group: Development/Languages/C and C++ Version: 4.2 -Release: 4 +Release: 5 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/ @@ -168,10 +162,9 @@ License: GPLv2+ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 -Release: 4 +Release: 5 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: @@ -238,7 +231,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 -Release: 4 +Release: 5 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -251,7 +244,6 @@ 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 @@ -270,7 +262,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.2 -Release: 4 +Release: 5 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -283,7 +275,6 @@ 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. @@ -302,13 +293,12 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 -Release: 4 +Release: 5 AutoReqProv: on %if %suse_version > 1120 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. @@ -363,7 +353,6 @@ done %patch30 -p0 -b .destdir %patch20 -p0 -b .0 - %build LANG=POSIX LC_ALL=$LANG @@ -541,7 +530,6 @@ popd make -C examples/loadables/ make documentation - %install pushd ../readline-%{rl_vers}%{extend} make install htmldir=%{_defaultdocdir}/readline \ @@ -613,37 +601,29 @@ 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 @@ -659,11 +639,9 @@ 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 @@ -673,7 +651,6 @@ 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/ @@ -682,14 +659,12 @@ 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} @@ -697,7 +672,6 @@ 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/ @@ -705,13 +679,10 @@ 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