From ed58c203062af2f9b784b57305b0c63929861061 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 3 Aug 2007 15:30:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=7 --- bash.changes | 6 +++ bash.spec | 119 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 100 insertions(+), 25 deletions(-) diff --git a/bash.changes b/bash.changes index f4c1b41f..7b9299c2 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 31 17:32:55 CEST 2007 - werner@suse.de + +- Branch off bash-doc and readline-doc (bug #260209) +- Rename readline to libreadline5 (bug #260209) + ------------------------------------------------------------------- Thu Apr 19 13:33:30 CEST 2007 - schwab@suse.de diff --git a/bash.spec b/bash.spec index 7ab0fbe7..b2d40918 100644 --- a/bash.spec +++ b/bash.spec @@ -12,14 +12,16 @@ Name: bash BuildRequires: bison ncurses-devel -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/Shells -Requires: readline >= 5.2 -Autoreqprov: on -Version: 3.2 -Release: 20 %define bash_vers 3.2 %define rl_vers 5.2 +Requires: /%{_lib}/libhistory.so.%{rl_vers} +Requires: /%{_lib}/libreadline.so.%{rl_vers} +Recommends: bash-doc = %bash_vers +Autoreqprov: on +Version: 3.2 +Release: 42 Summary: The GNU Bourne-Again Shell URL: http://www.gnu.org/software/bash/bash.html Source0: bash-%{bash_vers}.tar.bz2 @@ -62,15 +64,37 @@ Authors: Brian Fox Chet Ramey -%package -n readline -Summary: The Readline Library -Group: System/Libraries -Provides: bash:/lib/libreadline.so.5 -Version: 5.2 -Release: 20 +%package -n bash-doc +Summary: Documentation how to Use the GNU Bourne-Again Shell +Group: Documentation/Man +Provides: bash:/usr/share/info/bash.info.gz +Version: 3.2 +Release: 1 Autoreqprov: on -%description -n readline +%description -n bash-doc +This package contains the documentation for using the bourne shell +interpreter Bash. + + + +Authors: +-------- + Brian Fox + Chet Ramey + +%package -n libreadline5 +Summary: The Readline Library +Group: System/Libraries +Provides: bash:/%{_lib}/libreadline.so.5 +Version: 5.2 +Release: 1 +Recommends: readline-doc = %{version}-%{release} +Provides: readline = 5.2 +Obsoletes: readline <= 5.2 +Autoreqprov: on + +%description -n libreadline5 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. @@ -85,11 +109,14 @@ Authors: %package -n readline-devel Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ -Provides: bash:/usr/lib/libreadline.a +Provides: bash:/usr/%{_lib}/libreadline.a Version: 5.2 -Release: 20 -Requires: readline = %{version}-%{release}, %{_libdir}/libncurses.so -Requires: ncurses-devel +Release: 42 +Requires: libreadline5 = %{version}-%{release} +Requires: /%{_lib}/libhistory.so.%{rl_vers} +Requires: /%{_lib}/libreadline.so.%{rl_vers} +Requires: %{_libdir}/libncurses.so +Recommends: readline-doc = %{version} Autoreqprov: on %description -n readline-devel @@ -98,6 +125,25 @@ to develop applications that require these. +Authors: +-------- + Brian Fox + Chet Ramey + +%package -n readline-doc +Summary: Documentation how to Use and Programm with the Readline Library +Group: System/Libraries +Provides: readline:/usr/share/info/readline.info.gz +Version: 5.2 +Release: 1 +Autoreqprov: on + +%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. + + + Authors: -------- Brian Fox @@ -241,11 +287,10 @@ cd ../bash-%{bash_vers} %install cd ../readline-%{rl_vers} - make install DESTDIR=$RPM_BUILD_ROOT + make install htmldir=%{_defaultdocdir}/readline DESTDIR=$RPM_BUILD_ROOT make install-shared libdir=/%{_lib} linkagedir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/bash mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/bash - install -m 644 doc/*.html $RPM_BUILD_ROOT%{_defaultdocdir}/bash/ chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libhistory.so.%{rl_vers} chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libreadline.so.%{rl_vers} rm -f $RPM_BUILD_ROOT/%{_lib}/libhistory.so.%{rl_vers}*old @@ -289,15 +334,30 @@ rm -fv $RPM_BUILD_ROOT/usr/%{_lib}/libhistory.so.* rm -fv $RPM_BUILD_ROOT/usr/%{_lib}/libreadline.so.* rm -fv $RPM_BUILD_ROOT/usr/share/info/rluserman.info.gz rm -fv $RPM_BUILD_ROOT/usr/share/man/man3/history.3* +%find_lang bash -%post -n readline -p /sbin/ldconfig +%post -n bash-doc +%install_info --info-dir=%{_infodir} %{_infodir}/bash.info.gz -%postun -n readline -p /sbin/ldconfig +%postun -n bash-doc +%install_info_delete --info-dir=%{_infodir} %{_infodir}/bash.info.gz + +%post -n libreadline5 -p /sbin/ldconfig + +%postun -n libreadline5 -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 rm -rf $RPM_BUILD_ROOT -%files +%files -f bash.lang %defattr(-,root,root) /bin/bash /bin/sh @@ -305,22 +365,22 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/bashbug /usr/bin/rbash /usr/bin/sh + +%files -n bash-doc +%defattr(-,root,root) %doc %{_infodir}/bash.info.gz %doc %{_mandir}/man1/bash.1.gz %doc %{_mandir}/man1/bashbuiltins.1.gz %doc %{_mandir}/man1/bashbug.1.gz %doc %{_mandir}/man1/rbash.1.gz %doc %{_defaultdocdir}/bash/ -/usr/share/locale/*/LC_MESSAGES/bash.mo -%files -n readline +%files -n libreadline5 %defattr(-,root,root) /%{_lib}/libhistory.so.5 /%{_lib}/libhistory.so.%{rl_vers} /%{_lib}/libreadline.so.5 /%{_lib}/libreadline.so.%{rl_vers} -%doc %{_infodir}/history.info.gz -%doc %{_infodir}/readline.info.gz %files -n readline-devel %defattr(-,root,root) @@ -331,7 +391,16 @@ rm -rf $RPM_BUILD_ROOT %{_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 +* Tue Jul 31 2007 - werner@suse.de +- Branch off bash-doc and readline-doc (bug #260209) +- Rename readline to libreadline5 (bug #260209) * Thu Apr 19 2007 - schwab@suse.de - Fix bug in readline redisplay. * Thu Mar 29 2007 - dmueller@suse.de