Accepting request 1240150 from Base:System
- As in bash-sh there is only a symbolic link avoid to require a version - Move (/etc/skel/.bashrc) and (/etc/skel/.profile) to (/usr/etc/skel/). OBS-URL: https://build.opensuse.org/request/show/1240150 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=195
This commit is contained in:
commit
9f72dc4ce8
10
bash.changes
10
bash.changes
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 24 12:09:40 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
- As in bash-sh there is only a symbolic link avoid to require a version
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Dec 28 20:38:43 UTC 2024 - Heitor Moreira da Silva <heitor@opensuse.org>
|
||||||
|
|
||||||
|
- Move (/etc/skel/.bashrc) and (/etc/skel/.profile) to (/usr/etc/skel/).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 16 12:47:07 UTC 2024 - Dr. Werner Fink <werner@suse.de>
|
Mon Dec 16 12:47:07 UTC 2024 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
19
bash.spec
19
bash.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package bash
|
# spec file for package bash
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -109,7 +109,7 @@ BuildRequires: pkgconfig(readline) >= %{rl_version}
|
|||||||
%if %{with alternatives}
|
%if %{with alternatives}
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
Requires(post): libreadline%{rl_major} >= %{rl_version}
|
Requires(post): libreadline%{rl_major} >= %{rl_version}
|
||||||
Requires(preun):update-alternatives
|
Requires(preun): update-alternatives
|
||||||
%endif
|
%endif
|
||||||
Requires: libreadline%{rl_major} >= %{rl_version}
|
Requires: libreadline%{rl_major} >= %{rl_version}
|
||||||
Suggests: bash-doc = %{version}
|
Suggests: bash-doc = %{version}
|
||||||
@ -148,7 +148,7 @@ Group: System/Shells
|
|||||||
Provides: alternative(sh)
|
Provides: alternative(sh)
|
||||||
Conflicts: alternative(sh)
|
Conflicts: alternative(sh)
|
||||||
Provides: bash:%{_bindir}/sh
|
Provides: bash:%{_bindir}/sh
|
||||||
PreReq: bash = %{version}
|
PreReq: bash
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description sh
|
%description sh
|
||||||
@ -567,11 +567,9 @@ set in %{_sysconfdir}/inputrc or $HOME/.inputrc avoids this
|
|||||||
but disables multi byte handling.
|
but disables multi byte handling.
|
||||||
EOF
|
EOF
|
||||||
# remove unpackaged files
|
# remove unpackaged files
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/skel
|
mkdir -p %{buildroot}%{_prefix}%{_sysconfdir}/skel
|
||||||
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.bashrc
|
install -m 640 %{SOURCE5} %{buildroot}%{_prefix}%{_sysconfdir}/skel/.bashrc
|
||||||
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/skel/.profile
|
install -m 640 %{SOURCE6} %{buildroot}%{_prefix}%{_sysconfdir}/skel/.profile
|
||||||
touch -t 199605181720.50 %{buildroot}%{_sysconfdir}/skel/.bash_history
|
|
||||||
chmod 600 %{buildroot}%{_sysconfdir}/skel/.bash_history
|
|
||||||
%find_lang bash
|
%find_lang bash
|
||||||
%fdupes -s %{buildroot}%{_datadir}/bash/helpfiles
|
%fdupes -s %{buildroot}%{_datadir}/bash/helpfiles
|
||||||
sed -ri '1{ s@/bin/sh@/bin/bash@ }' %{buildroot}%{_bindir}/bashbug
|
sed -ri '1{ s@/bin/sh@/bin/bash@ }' %{buildroot}%{_bindir}/bashbug
|
||||||
@ -589,9 +587,8 @@ fi
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history
|
%{_prefix}%{_sysconfdir}/skel/.bashrc
|
||||||
%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
|
%{_prefix}%{_sysconfdir}/skel/.profile
|
||||||
%config %attr(644,root,root) %{_sysconfdir}/skel/.profile
|
|
||||||
%if %{with alternatives}
|
%if %{with alternatives}
|
||||||
%ghost %config %{_sysconfdir}/alternatives/sh
|
%ghost %config %{_sysconfdir}/alternatives/sh
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user