testing/grep
SHA256
3
0
Fork 0
forked from pool/grep
Code Pull Requests Activity

Accepting request 849610 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849610
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=109
This commit is contained in:
Dirk Mueller 2020-11-26 10:08:54 +00:00 committed by Git OBS Bridge
parent 34aeb1e3df
commit 3402f78091
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grep.changes
View File

@ -11,6 +11,11 @@ Mon Nov 9 15:47:58 UTC 2020 - Andreas Schwab <schwab@suse.de>
failure. failure.
- werror-return-type.patch: work around gcc bug - werror-return-type.patch: work around gcc bug
-------------------------------------------------------------------
Fri Oct 30 10:12:18 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 28 08:54:47 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de> Mon Sep 28 08:54:47 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

8
grep.spec
View File

@ -64,12 +64,12 @@ make %{?_smp_mflags} check
%install %install
%make_install %make_install
#UsrMerge %if !0%{?usrmerged}
install -d %{buildroot}/bin install -d %{buildroot}/bin
ln -sf %{_bindir}/egrep %{buildroot}/bin/egrep ln -sf %{_bindir}/egrep %{buildroot}/bin/egrep
ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep
ln -sf %{_bindir}/grep %{buildroot}/bin/grep ln -sf %{_bindir}/grep %{buildroot}/bin/grep
#EndUsrMerge %endif
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%find_lang %{name} %find_lang %{name}
@ -83,11 +83,11 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep
%defattr(-,root,root) %defattr(-,root,root)
%license COPYING %license COPYING
%doc README AUTHORS NEWS THANKS TODO ChangeLog* %doc README AUTHORS NEWS THANKS TODO ChangeLog*
#UsrMerge %if !0%{?usrmerged}
/bin/egrep /bin/egrep
/bin/fgrep /bin/fgrep
/bin/grep /bin/grep
#EndUsrMerge %endif
%{_bindir}/egrep %{_bindir}/egrep
%{_bindir}/fgrep %{_bindir}/fgrep
%{_bindir}/grep %{_bindir}/grep