pool/grep
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1054451 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1054451
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=127
This commit is contained in:
Dirk Mueller 2023-01-04 10:54:38 +00:00 committed by Git OBS Bridge
parent 63994663b8
commit 858941fd15
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grep.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:25:45 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Tue Sep 20 08:29:41 UTC 2022 - Andreas Schwab <schwab@suse.de>

6
grep.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package grep
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -71,7 +71,7 @@ echo 'int main() { return 77; }' > gnulib-tests/test-free.c
%install
%make_install
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
install -d %{buildroot}/bin
ln -sf %{_bindir}/egrep %{buildroot}/bin/egrep
ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep
@ -83,7 +83,7 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep
%files
%license COPYING
%doc README AUTHORS NEWS THANKS TODO ChangeLog*
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/bin/egrep
/bin/fgrep
/bin/grep