testing/bash
SHA256
3
0
Fork 0
forked from pool/bash
Code Pull Requests Activity

ghosts

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=274
This commit is contained in:
Dr. Werner Fink 2019-03-01 14:10:47 +00:00 committed by Git OBS Bridge
parent d8f0e8569f
commit 32fc90b562
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bash.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 1 14:01:16 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Make update-alternatives work flawless
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 8 10:30:17 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Fri Feb 8 10:30:17 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

27
bash.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
@ -85,6 +85,8 @@ BuildRequires: readline-devel == 8.0
BuildRequires: screen BuildRequires: screen
BuildRequires: sed BuildRequires: sed
BuildRequires: update-alternatives BuildRequires: update-alternatives
Requires(post): update-alternatives
Requires(postun): update-alternatives
%global _sysconfdir /etc %global _sysconfdir /etc
%global _incdir %{_includedir} %global _incdir %{_includedir}
%global _ldldir /%{_lib}/bash %global _ldldir /%{_lib}/bash
@ -438,10 +440,19 @@ test ${rl1[2]} = ${rl2[2]} || exit 1
rm -rf %{buildroot}/%{_lib}/pkgconfig rm -rf %{buildroot}/%{_lib}/pkgconfig
sed -ri '/CC = gcc/s@(CC = gcc).*@\1@' %{buildroot}%{_libdir}/pkgconfig/bash.pc sed -ri '/CC = gcc/s@(CC = gcc).*@\1@' %{buildroot}%{_libdir}/pkgconfig/bash.pc
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
ln -sf bash %{buildroot}/%{_bindir}/rbash mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s %{_bindir}/bash %{buildroot}/bin/bash #
ln -sf bash %{buildroot}/%{_bindir}/sh # It should be noted that the move of /bin/bash to /usr/bin/bash
ln -s %{_bindir}/sh %{buildroot}/bin/sh # had NOT done by me at 2019/02/08. Now only a symbolic link
# remains here :(
# The same had happen for the system POSIX shell /bin/sh
#
touch %{buildroot}%{_sysconfdir}/alternatives/sh \
%{buildroot}%{_sysconfdir}/alternatives/_bin_sh
ln -sf %{_bindir}/bash %{buildroot}/bin/bash
ln -sf bash %{buildroot}%{_bindir}/rbash
ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh
ln -sf %{_sysconfdir}/alternatives/_bin_sh %{buildroot}/bin/sh
install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name}
install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name}
install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name}
@ -480,7 +491,7 @@ EOF
%post %post
update-alternatives --force \ update-alternatives --force \
--install "%{_bindir}/sh" sh "%{_bindir}/bash" 100 \ --install "%{_bindir}/sh" sh "%{_bindir}/bash" 10100 \
--slave "/bin/sh" _bin_sh "%{_bindir}/sh" --slave "/bin/sh" _bin_sh "%{_bindir}/sh"
%postun %postun
@ -497,7 +508,7 @@ fi
%clean %clean
LD_LIBRARY_PATH=%{buildroot}/%{_lib} \ LD_LIBRARY_PATH=%{buildroot}/%{_lib} \
ldd -u -r %{buildroot}/bin/bash || true ldd -u -r %{buildroot}/bin/bash || true
%{?buildroot: rm -rf %{buildroot}} %{?buildroot: %__rm -rf %{buildroot}}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -505,6 +516,8 @@ ldd -u -r %{buildroot}/bin/bash || true
%config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history %config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history
%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc %config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
%config %attr(644,root,root) %{_sysconfdir}/skel/.profile %config %attr(644,root,root) %{_sysconfdir}/skel/.profile
%ghost %{_sysconfdir}/alternatives/sh
%ghost %{_sysconfdir}/alternatives/_bin_sh
/bin/bash /bin/bash
/bin/sh /bin/sh
%dir %{_sysconfdir}/bash_completion.d %dir %{_sysconfdir}/bash_completion.d