Accepting request 851091 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/851091
OBS-URL: https://build.opensuse.org/package/show/shells/dash?expand=0&rev=34
This commit is contained in:
Avindra Goolcharan 2020-12-02 23:32:42 +00:00 committed by Git OBS Bridge
parent b2987142fa
commit 69a30cc62d
2 changed files with 9 additions and 0 deletions

View File

@ -10,6 +10,11 @@ Sun Oct 18 18:08:34 UTC 2020 - Dirk Mueller <dmueller@suse.com>
* shell: Group readdir64/dirent64 with open64 * shell: Group readdir64/dirent64 with open64
- add LICENSE file - add LICENSE file
-------------------------------------------------------------------
Fri Oct 16 09:00:37 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 16 17:55:38 UTC 2020 - Dirk Mueller <dmueller@suse.com> Sun Aug 16 17:55:38 UTC 2020 - Dirk Mueller <dmueller@suse.com>

View File

@ -48,14 +48,18 @@ possible without sacrificing speed where possible.
%install %install
%make_install %make_install
# compatibility symlink to /bin # compatibility symlink to /bin
%if !0%{?usrmerged}
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
ln -s %{_bindir}/dash %{buildroot}/bin/dash ln -s %{_bindir}/dash %{buildroot}/bin/dash
%endif
%files %files
%license COPYING %license COPYING
%doc ChangeLog %doc ChangeLog
%{_bindir}/dash %{_bindir}/dash
%if !0%{?usrmerged}
/bin/dash /bin/dash
%endif
%{_mandir}/man1/dash.1%{?ext_man} %{_mandir}/man1/dash.1%{?ext_man}
%changelog %changelog