diff --git a/gawk.changes b/gawk.changes index 05a9dde..36d0845 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:37:54 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Wed Nov 23 09:15:25 UTC 2022 - Andreas Schwab diff --git a/gawk.spec b/gawk.spec index 1ae06d7..9afb259 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,7 +1,7 @@ # # spec file for package gawk # -# 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 @@ -56,7 +56,7 @@ almost completely POSIX 1003.2 compliant. %install %make_install -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 install -d -m 755 %{buildroot}/bin ln -s %{_bindir}/gawk %{buildroot}/bin/gawk ln -s %{_bindir}/gawk %{buildroot}/bin/awk @@ -71,7 +71,7 @@ ln -sfv %{_mandir}/man1/gawk.1%{?ext_man} %{buildroot}%{_mandir}/man1/awk.1%{?ex %files -f %{name}.lang %config %{_sysconfdir}/profile.d/gawk.csh %config %{_sysconfdir}/profile.d/gawk.sh -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 #UsrMerge /bin/awk /bin/gawk