From 858941fd15e796a47735414696f2ff869b637a8093cbb0a3e2cd54493fdc3263 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 Jan 2023 10:54:38 +0000 Subject: [PATCH] Accepting request 1054451 from home:lnussel:usrmerge 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 --- grep.changes | 5 +++++ grep.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grep.changes b/grep.changes index e29d331..b3816f4 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 12:25:45 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Tue Sep 20 08:29:41 UTC 2022 - Andreas Schwab diff --git a/grep.spec b/grep.spec index 48f0f44..8c48c9c 100644 --- a/grep.spec +++ b/grep.spec @@ -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