Accepting request 850283 from Archiving

OBS-URL: https://build.opensuse.org/request/show/850283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpio?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2020-11-26 22:09:36 +00:00 committed by Git OBS Bridge
commit 5b6831d59b
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 08:49:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Fri Sep 11 11:45:35 UTC 2020 - Dirk Mueller <dmueller@suse.com>

View File

@ -102,9 +102,9 @@ mkdir -p %{buildroot}/{usr/bin,bin}
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -sf %{_sysconfdir}/alternatives/mt %{buildroot}%{_bindir}/mt
ln -sf %{_sysconfdir}/alternatives/mt.1%{ext_man} %{buildroot}%{_mandir}/man1/mt.1%{ext_man}
#UsrMerge
%if !0%{?usrmerged}
ln -sf %{_bindir}/cpio %{buildroot}/bin
#EndUsrMerge
%endif
%find_lang %{name}
@ -130,9 +130,9 @@ fi
%files
%license COPYING
%doc NEWS ChangeLog
#UsrMerge
%if !0%{?usrmerged}
/bin/cpio
#EndUsrMerge
%endif
%{_bindir}/cpio
%{_infodir}/cpio.info%{?ext_info}
%{_mandir}/man1/cpio.1%{?ext_man}