OBS User unknown 2007-12-12 21:07:41 +00:00 committed by Git OBS Bridge
parent 2e8f6e1876
commit bbc75c40d5
6 changed files with 133 additions and 49 deletions

View File

@ -201,6 +201,16 @@
.PD
.SH AUTHORS
Brian Fox, Free Software Foundation
--- support/printenv.c
+++ support/printenv.c 2007-12-06 16:33:46.899561365 +0100
@@ -27,6 +27,7 @@
#if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
+#include <stdio.h>
#include "bashansi.h"
--- support/rlvers.sh
+++ support/rlvers.sh 2006-03-27 14:15:25.000000000 +0200
@@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers

1
bash-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter(".*hidden-file-or-dir.*/etc/skel/\..*")

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 7 10:16:43 CET 2007 - werner@suse.de
- Add skel files .bashrc, bash_history, and .profile from aaa_skel
-------------------------------------------------------------------
Tue Dec 4 16:44:05 CET 2007 - werner@suse.de

112
bash.spec
View File

@ -19,7 +19,7 @@ Group: System/Shells
Recommends: bash-doc = %bash_vers
AutoReqProv: on
Version: 3.2
Release: 70
Release: 72
Summary: The GNU Bourne-Again Shell
Url: http://www.gnu.org/software/bash/bash.html
Source0: bash-%{bash_vers}.tar.bz2
@ -27,6 +27,9 @@ Source1: readline-%{rl_vers}.tar.bz2
Source2: bash-%{bash_vers}-patches.tar.bz2
Source3: readline-%{rl_vers}-patches.tar.bz2
Source4: run-tests
Source5: dot.bashrc
Source6: dot.profile
Source7: bash-rpmlintrc
Patch0: bash-%{bash_vers}.dif
Patch1: bash-2.03-manual.patch
Patch2: bash-2.05a-security.patch
@ -47,6 +50,8 @@ Patch23: readline-5.2-conf.patch
Patch24: readline-5.1-input.patch
Patch30: readline-5.1-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _incdir %{_includedir}
%description
Bash is an sh-compatible command interpreter that executes commands
@ -65,9 +70,10 @@ Authors:
%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
Provides: bash:%{_infodir}/bash.info.gz
PreReq: %install_info_prereq
Version: 3.2
Release: 29
Release: 31
AutoReqProv: on
%description -n bash-doc
@ -86,7 +92,7 @@ Summary: The Readline Library
Group: System/Libraries
Provides: bash:/%{_lib}/libreadline.so.5
Version: 5.2
Release: 29
Release: 31
Recommends: readline-doc = %{version}
Provides: readline = 5.2
Obsoletes: readline <= 5.2
@ -107,9 +113,9 @@ 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:%{_libdir}/libreadline.a
Version: 5.2
Release: 70
Release: 72
Requires: libreadline5 = %{version}
Requires: ncurses-devel
Requires: /%{_lib}/libhistory.so.%{rl_vers}
@ -131,9 +137,10 @@ Authors:
%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
Provides: readline:%{_infodir}/readline.info.gz
PreReq: %install_info_prereq
Version: 5.2
Release: 29
Release: 31
AutoReqProv: on
%description -n readline-doc
@ -213,7 +220,7 @@ cd ../readline-%{rl_vers}
export CFLAGS CFLAGS_FOR_BUILD CC
autoconf
./configure --build=%{_target_cpu}-suse-linux \
--prefix=/usr \
--prefix=%{_prefix} \
--with-curses \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
@ -251,7 +258,7 @@ cd ../bash-%{bash_vers}
bash support/mkconffiles -v
autoconf
./configure --build=%{_target_cpu}-suse-linux \
--prefix=/usr \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
@ -286,31 +293,31 @@ cd ../bash-%{bash_vers}
%install
cd ../readline-%{rl_vers}
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
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
rm -f $RPM_BUILD_ROOT/%{_lib}/libreadline.so.%{rl_vers}*old
make install htmldir=%{_defaultdocdir}/readline DESTDIR=%{buildroot}
make install-shared libdir=/%{_lib} linkagedir=%{_libdir} DESTDIR=%{buildroot}
rm -rf %{buildroot}%{_defaultdocdir}/bash
mkdir -p %{buildroot}%{_defaultdocdir}/bash
chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}
chmod 0755 %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}
rm -f %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old
rm -f %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old
cd ../bash-%{bash_vers}
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/bin
mv $RPM_BUILD_ROOT/usr/bin/bash $RPM_BUILD_ROOT/bin/
ln -sf bash $RPM_BUILD_ROOT/bin/sh
ln -sf ../../bin/bash $RPM_BUILD_ROOT/usr/bin/sh
ln -sf ../../bin/bash $RPM_BUILD_ROOT/usr/bin/rbash
install -m 644 COMPAT NEWS $RPM_BUILD_ROOT%{_defaultdocdir}/bash/
install -m 644 COPYING $RPM_BUILD_ROOT%{_defaultdocdir}/bash/
install -m 644 doc/FAQ $RPM_BUILD_ROOT%{_defaultdocdir}/bash/
install -m 644 doc/INTRO $RPM_BUILD_ROOT%{_defaultdocdir}/bash/
install -m 644 doc/*.html $RPM_BUILD_ROOT%{_defaultdocdir}/bash/
install -m 644 doc/builtins.1 $RPM_BUILD_ROOT%{_mandir}/man1/bashbuiltins.1
install -m 644 doc/rbash.1 $RPM_BUILD_ROOT%{_mandir}/man1/rbash.1
gzip -9f $RPM_BUILD_ROOT%{_infodir}/*.inf*[^z] || true
mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d
sed 's/^|//' > $RPM_BUILD_ROOT%{_defaultdocdir}/bash/BUGS <<\EOF
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}/bin
mv %{buildroot}%{_bindir}/bash %{buildroot}/bin/
ln -sf bash %{buildroot}/bin/sh
ln -sf ../../bin/bash %{buildroot}%{_bindir}/sh
ln -sf ../../bin/bash %{buildroot}%{_bindir}/rbash
install -m 644 COMPAT NEWS %{buildroot}%{_defaultdocdir}/bash/
install -m 644 COPYING %{buildroot}%{_defaultdocdir}/bash/
install -m 644 doc/FAQ %{buildroot}%{_defaultdocdir}/bash/
install -m 644 doc/INTRO %{buildroot}%{_defaultdocdir}/bash/
install -m 644 doc/*.html %{buildroot}%{_defaultdocdir}/bash/
install -m 644 doc/builtins.1 %{buildroot}%{_mandir}/man1/bashbuiltins.1
install -m 644 doc/rbash.1 %{buildroot}%{_mandir}/man1/rbash.1
gzip -9f %{buildroot}%{_infodir}/*.inf*[^z] || true
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
sed 's/^|//' > %{buildroot}%{_defaultdocdir}/bash/BUGS <<\EOF
Known problems
--------------
|
@ -325,15 +332,20 @@ bash-%{bash_vers}>
|
In other words the prompt overwrites the output of the
echo comand. The boolean variable byte-oriented
set in /etc/inputrc or $HOME/.inputrc avoids this
set in %{_sysconfdir}/inputrc or $HOME/.inputrc avoids this
but disables multi byte handling.
EOF
# remove unpackaged files
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
# remove unpackaged files
rm -fv %{buildroot}%{_libdir}/libhistory.so.*
rm -fv %{buildroot}%{_libdir}/libreadline.so.*
rm -fv %{buildroot}%{_infodir}/rluserman.info.gz
rm -fv %{buildroot}%{_mandir}/man3/history.3*
mkdir -p %{buildroot}%{_sysconfdir}/skel
install -m 644 %{S:5} %{buildroot}%{_sysconfdir}/skel/.bashrc
install -m 644 %{S:6} %{buildroot}%{_sysconfdir}/skel/.profile
touch -t 199605181720.50 %{buildroot}%{_sysconfdir}/skel/.bash_history
chmod 600 %{buildroot}%{_sysconfdir}/skel/.bash_history
%find_lang bash
%post -n bash-doc
%install_info --info-dir=%{_infodir} %{_infodir}/bash.info.gz
@ -353,17 +365,17 @@ rm -fv $RPM_BUILD_ROOT/usr/share/man/man3/history.3*
%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 -f bash.lang
%defattr(-,root,root)
%attr(600,root,root) %{_sysconfdir}/skel/.bash_history
%attr(644,root,root) %{_sysconfdir}/skel/.bashrc
%attr(644,root,root) %{_sysconfdir}/skel/.profile
/bin/bash
/bin/sh
%dir /etc/bash_completion.d
/usr/bin/bashbug
/usr/bin/rbash
/usr/bin/sh
%dir %{_sysconfdir}/bash_completion.d
%{_bindir}/bashbug
%{_bindir}/rbash
%{_bindir}/sh
%files -n bash-doc
%defattr(-,root,root)
@ -383,7 +395,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n readline-devel
%defattr(-,root,root)
/usr/include/readline/
%{_incdir}/readline/
%{_libdir}/libhistory.a
%{_libdir}/libhistory.so
%{_libdir}/libreadline.a
@ -397,6 +409,8 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_defaultdocdir}/readline/
%changelog
* Fri Dec 07 2007 - werner@suse.de
- Add skel files .bashrc, bash_history, and .profile from aaa_skel
* Tue Dec 04 2007 - werner@suse.de
- Extend fix for off-by-one error in libreadline (bug #274120)
- Enable ssh detection in the bash (bug #345570)

28
dot.bashrc Normal file
View File

@ -0,0 +1,28 @@
# Sample .bashrc for SuSE Linux
# Copyright (c) SuSE GmbH Nuernberg
# There are 3 different types of shells in bash: the login shell, normal shell
# and interactive shell. Login shells read ~/.profile and interactive shells
# read ~/.bashrc; in our setup, /etc/profile sources ~/.bashrc - thus all
# settings made here will also take effect in a login shell.
#
# NOTE: It is recommended to make language settings in ~/.profile rather than
# here, since multilingual X sessions would not work properly if LANG is over-
# ridden in every subshell.
# Some applications read the EDITOR variable to determine your favourite text
# editor. So uncomment the line below and enter the editor of your choice :-)
#export EDITOR=/usr/bin/vim
#export EDITOR=/usr/bin/mcedit
# For some news readers it makes sense to specify the NEWSSERVER variable here
#export NEWSSERVER=your.news.server
# If you want to use a Palm device with Linux, uncomment the two lines below.
# For some (older) Palm Pilots, you might need to set a lower baud rate
# e.g. 57600 or 38400; lowest is 9600 (very slow!)
#
#export PILOTPORT=/dev/pilot
#export PILOTRATE=115200
test -s ~/.alias && . ~/.alias || true

26
dot.profile Normal file
View File

@ -0,0 +1,26 @@
# Sample .profile for SuSE Linux
# rewritten by Christian Steinruecken <cstein@suse.de>
#
# This file is read each time a login shell is started.
# All other interactive shells will only read .bashrc; this is particularly
# important for language settings, see below.
test -z "$PROFILEREAD" && . /etc/profile
# Most applications support several languages for their output.
# To make use of this feature, simply uncomment one of the lines below or
# add your own one (see /usr/share/locale/locale.alias for more codes)
#
#export LANG=de_DE.UTF-8 # uncomment this line for German output
#export LANG=fr_FR.UTF-8 # uncomment this line for French output
#export LANG=es_ES.UTF-8 # uncomment this line for Spanish output
# Some people don't like fortune. If you uncomment the following lines,
# you will have a fortune each time you log in ;-)
#if [ -x /usr/bin/fortune ] ; then
# echo
# /usr/bin/fortune
# echo
#fi