Accepting request 849683 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849683
OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=46
This commit is contained in:
Dirk Mueller 2020-11-26 10:07:17 +00:00 committed by Git OBS Bridge
parent 5ec63c6c7d
commit 5de068c48d
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 08:47:29 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 31 07:00:11 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de> Mon Aug 31 07:00:11 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>

View File

@ -66,10 +66,10 @@ make %{?_smp_mflags} check
%install %install
%make_install %make_install
#UsrMerge %if !0%{?usrmerged}
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
ln -s %{_bindir}/sed %{buildroot}/bin/sed ln -s %{_bindir}/sed %{buildroot}/bin/sed
#EndUserMerge %endif
%find_lang %{name} %find_lang %{name}
%check %check
@ -85,7 +85,9 @@ make %{?_smp_mflags} check
%files %files
%license COPYING* %license COPYING*
%doc AUTHORS BUGS NEWS README* THANKS %doc AUTHORS BUGS NEWS README* THANKS
%if !0%{?usrmerged}
/bin/sed /bin/sed
%endif
%{_bindir}/sed %{_bindir}/sed
%{_mandir}/man*/*%{ext_man} %{_mandir}/man*/*%{ext_man}
%{_infodir}/sed.info*%{ext_info} %{_infodir}/sed.info*%{ext_info}