Hello community,
here is the log from the commit of package bash
checked in at Wed Dec 12 22:07:39 CET 2007.
--------
--- bash/bash.changes 2007-12-04 16:46:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/bash/bash.changes 2007-12-06 17:13:21.605723000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 7 10:16:43 CET 2007 - werner@suse.de
+
+- Add skel files .bashrc, bash_history, and .profile from aaa_skel
+
+-------------------------------------------------------------------
New:
----
bash-rpmlintrc
dot.bashrc
dot.profile
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash.spec ++++++
--- /var/tmp/diff_new_pack.o10223/_old 2007-12-12 22:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.o10223/_new 2007-12-12 22:07:22.000000000 +0100
@@ -19,7 +19,7 @@
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 @@
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 @@
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 @@
%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 @@
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 @@
%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 @@
%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 @@
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 @@
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 @@
%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 @@
|
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 @@
%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 @@
%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 @@
%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)
++++++ bash-3.2.dif ++++++
--- /var/tmp/diff_new_pack.o10223/_old 2007-12-12 22:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.o10223/_new 2007-12-12 22:07:22.000000000 +0100
@@ -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