diff --git a/dash.changes b/dash.changes index a28fabd..11e1a5f 100644 --- a/dash.changes +++ b/dash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:30:43 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Fri Dec 23 06:51:58 UTC 2022 - Dirk Müller diff --git a/dash.spec b/dash.spec index dab79e0..25cc448 100644 --- a/dash.spec +++ b/dash.spec @@ -1,7 +1,7 @@ # # spec file for package dash # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2013 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -57,7 +57,7 @@ Use dash as /bin/sh implementation. %install %make_install # compatibility symlink to /bin -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p %{buildroot}/bin ln -s %{_bindir}/dash %{buildroot}/bin/dash %endif @@ -67,7 +67,7 @@ ln -sf %{_bindir}/dash %{buildroot}%{_bindir}/sh %license COPYING %doc ChangeLog %{_bindir}/dash -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/dash %endif %{_mandir}/man1/dash.1%{?ext_man}