From dd2a1d1576e770ca106a317d192f21729d99c42c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 22 Mar 2011 16:51:14 +0000 Subject: [PATCH 1/7] Updating link to change in openSUSE:Factory/bash revision 78.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=47b9533004ae0af26c6f370fef45a810 --- bash.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bash.spec b/bash.spec index 61a9dd8d..15e41e01 100644 --- a/bash.spec +++ b/bash.spec @@ -37,7 +37,7 @@ Recommends: bash-doc = %bash_vers %endif AutoReqProv: on Version: 4.2 -Release: 3 +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 @@ -106,7 +106,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 -Release: 3 +Release: 4 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -142,7 +142,7 @@ License: GPLv2+ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.2 -Release: 3 +Release: 4 AutoReqProv: on %description -n bash-devel @@ -162,7 +162,7 @@ License: GPLv2+ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 -Release: 3 +Release: 4 AutoReqProv: on %description -n bash-loadables @@ -231,7 +231,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 -Release: 3 +Release: 4 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -262,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: 3 +Release: 4 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -293,7 +293,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 -Release: 3 +Release: 4 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch From 977f71a24deaa4f34deedc462fa7ebb90d493905 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 12 May 2011 10:50:57 +0000 Subject: [PATCH 2/7] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=73 --- bash-4.2-patches.tar.bz2 | 4 ++-- bash.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bash-4.2-patches.tar.bz2 b/bash-4.2-patches.tar.bz2 index 716e1a46..96c2a757 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:b4f7a34dadaf65c638a739688c793004503971342425710ba419fcc8b1b733eb -size 7212 +oid sha256:2ebc79102e7f4e5eec2efa340c1bf52d0b0302f55c9d748d76da768255343244 +size 8428 diff --git a/bash.changes b/bash.changes index 11a90a51..c33c9adc 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 12 12:04:28 CEST 2011 - werner@suse.de + +- Update bash 4.2 to patch level 10 +- Add patch from upstream to avoid loosing quoted-nulls +- Add modified patch to avod endless loop in UTF-8 locale + ------------------------------------------------------------------- Tue Mar 22 13:16:43 CET 2011 - werner@suse.de From 203729c8d38b8543c87d8e3ea3985fbd69e832c8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 20 Jun 2011 09:03:29 +0000 Subject: [PATCH 3/7] trigger service run OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=77 --- _service:download_files:bash-4.2.tar.gz | 3 ++ _service:download_files:readline-6.2.tar.gz | 3 ++ bash-4.2-patches.tar.bz2 | 4 +-- bash-4.2.tar.bz2 | 3 -- bash-4.2.tar.gz | 3 ++ bash.changes | 11 +++++++ bash.spec | 33 +++++++++++++++++++-- readline-6.2.tar.bz2 | 3 -- readline-6.2.tar.gz | 3 ++ 9 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 _service:download_files:bash-4.2.tar.gz create mode 100644 _service:download_files:readline-6.2.tar.gz delete mode 100644 bash-4.2.tar.bz2 create mode 100644 bash-4.2.tar.gz delete mode 100644 readline-6.2.tar.bz2 create mode 100644 readline-6.2.tar.gz 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 From 13265c99710282a5c8c663c51c9e29e1b9373920 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 21 Jun 2011 17:03:06 +0000 Subject: [PATCH 4/7] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=78 --- bash-4.2-patches.tar.bz2 | 4 ++-- bash.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bash-4.2-patches.tar.bz2 b/bash-4.2-patches.tar.bz2 index 81cdad88..83f5bdbb 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:5f1bf907129dd4d5085472eb618aae814e29cb7906741fda01d0b2c519510ba3 -size 8767 +oid sha256:1abc3a4d6468bd4b4f02f7a2a0edcd3072e5b78ff8bb239f876111d5801611cd +size 9124 diff --git a/bash.changes b/bash.changes index e200aa40..0bfc0b03 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 21 18:58:56 CEST 2011 - werner@suse.de + +- Add fix from upstream mailing list to avoid crash + ------------------------------------------------------------------- Fri Jun 17 11:43:00 UTC 2011 - coolo@novell.com From a4c00b9417ad46369a752edde1d20dfcbc8a6161 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jun 2011 08:46:27 +0000 Subject: [PATCH 5/7] Accepting request 74276 from Base:System baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/74276 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=79 --- _service:download_files:bash-4.2.tar.gz | 3 --- _service:download_files:readline-6.2.tar.gz | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 _service:download_files:bash-4.2.tar.gz delete mode 100644 _service:download_files:readline-6.2.tar.gz diff --git a/_service:download_files:bash-4.2.tar.gz b/_service:download_files:bash-4.2.tar.gz deleted file mode 100644 index 55a9b300..00000000 --- a/_service:download_files:bash-4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 980dea6f..00000000 --- a/_service:download_files:readline-6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 -size 2277926 From 17697c95c83f3ec6c53383f56233bde333a7972c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jun 2011 08:46:38 +0000 Subject: [PATCH 6/7] Updating link to change in openSUSE:Factory/bash revision 80.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=9a6797cea3e903febb7a736f4c985c29 --- _service:download_files:bash-4.2.tar.gz | 3 ++ _service:download_files:readline-6.2.tar.gz | 3 ++ bash.spec | 43 ++++----------------- 3 files changed, 13 insertions(+), 36 deletions(-) create mode 100644 _service:download_files:bash-4.2.tar.gz create mode 100644 _service:download_files:readline-6.2.tar.gz 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 From 613da8eeb0a79fa3098840b28e71c43cc509267d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Sep 2011 15:00:02 +0000 Subject: [PATCH 7/7] - remove autoreqprov and author lists OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=81 --- _service:download_files:bash-4.2.tar.gz | 3 -- _service:download_files:readline-6.2.tar.gz | 3 -- bash.changes | 5 ++ bash.spec | 54 --------------------- 4 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 _service:download_files:bash-4.2.tar.gz delete mode 100644 _service:download_files:readline-6.2.tar.gz diff --git a/_service:download_files:bash-4.2.tar.gz b/_service:download_files:bash-4.2.tar.gz deleted file mode 100644 index 55a9b300..00000000 --- a/_service:download_files:bash-4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 980dea6f..00000000 --- a/_service:download_files:readline-6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 -size 2277926 diff --git a/bash.changes b/bash.changes index 0bfc0b03..36589e89 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 19 14:59:39 UTC 2011 - coolo@suse.com + +- remove autoreqprov and author lists + ------------------------------------------------------------------- Tue Jun 21 18:58:56 CEST 2011 - werner@suse.de diff --git a/bash.spec b/bash.spec index 6b992b75..5fea4a55 100644 --- a/bash.spec +++ b/bash.spec @@ -35,7 +35,6 @@ Recommends: bash-lang = %bash_vers Suggests: command-not-found Recommends: bash-doc = %bash_vers %endif -AutoReqProv: on Version: 4.2 Release: 5 Summary: The GNU Bourne-Again Shell @@ -92,13 +91,6 @@ features from the Korn and C shells (ksh and csh). Bash is intended to be a conformant implementation of the IEEE Posix Shell and Tools specification (IEEE Working Group 1003.2). - - -Authors: --------- - Brian Fox - Chet Ramey - %package -n bash-doc License: GPLv2+ Summary: Documentation how to Use the GNU Bourne-Again Shell @@ -107,7 +99,6 @@ Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 Release: 5 -AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch %endif @@ -116,12 +107,6 @@ BuildArch: noarch This package contains the documentation for using the bourne shell interpreter Bash. - - -Authors: --------- - Brian Fox - Chet Ramey %if %{defined lang_package} %lang_package(bash) %else @@ -143,27 +128,18 @@ Summary: Include Files mandatory for Development of bash loadable builtin Group: Development/Languages/C and C++ Version: 4.2 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/ on the compilers command line. - - -Authors: --------- - Brian Fox - Chet Ramey - %package -n bash-loadables License: GPLv2+ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 Release: 5 -AutoReqProv: on %description -n bash-loadables This package contains the examples for the ready-to-dynamic-load @@ -219,12 +195,6 @@ unlink Remove a directory entry. whoami Print out username of current user. - -Authors: --------- - Brian Fox - Chet Ramey - %package -n libreadline6 License: GPLv2+ Summary: The Readline Library @@ -242,20 +212,12 @@ Obsoletes: readline-64bit # 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 includes history and search functionality. - - -Authors: --------- - Brian Fox - Chet Ramey - %package -n readline-devel License: GPLv2+ Summary: Include Files and Libraries mandatory for Development @@ -268,7 +230,6 @@ Requires: ncurses-devel %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: readline-devel-64bit @@ -279,13 +240,6 @@ Obsoletes: readline-devel-64bit This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Brian Fox - Chet Ramey - %package -n readline-doc License: GPLv2+ Summary: Documentation how to Use and Program with the Readline Library @@ -294,7 +248,6 @@ Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 Release: 5 -AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch %endif @@ -303,13 +256,6 @@ BuildArch: noarch This package contains the documentation for using the readline library as well as programming with the interface of the readline library. - - -Authors: --------- - Brian Fox - Chet Ramey - %prep %setup -q -n bash-%{bash_vers}%{extend} -b1 -b2 -b3 for p in ../bash-%{bash_vers}-patches/*; do