Dominique Leuenberger 2020-11-26 22:09:19 +00:00 committed by Git OBS Bridge
commit 3b4acbfe5a
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 09:48:05 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 30 09:28:55 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de> Sun Aug 30 09:28:55 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>

View File

@ -107,10 +107,10 @@ make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{_infodir}/find-maint* rm -f %{buildroot}%{_infodir}/find-maint*
%find_lang %{name} %find_lang %{name}
#UsrMerge %if !0%{?usrmerged}
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
ln -sf %{_bindir}/find %{buildroot}/bin ln -sf %{_bindir}/find %{buildroot}/bin
#UsrMerge %endif
rm %{buildroot}%{_bindir}/locate rm %{buildroot}%{_bindir}/locate
rm %{buildroot}%{_bindir}/updatedb rm %{buildroot}%{_bindir}/updatedb
@ -129,9 +129,9 @@ rm %{buildroot}%{_mandir}/man5/locatedb.5*
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license COPYING %license COPYING
%doc AUTHORS NEWS README THANKS TODO %doc AUTHORS NEWS README THANKS TODO
#UsrMerge %if !0%{?usrmerged}
/bin/find /bin/find
#UsrMerge %endif
%{_bindir}/find %{_bindir}/find
%{_bindir}/xargs %{_bindir}/xargs
%doc %{_infodir}/find.info*.gz %doc %{_infodir}/find.info*.gz