diff --git a/findutils.changes b/findutils.changes index a8d8e77..0e16b97 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:36:38 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Wed Feb 2 01:07:20 UTC 2022 - Bernhard Voelker diff --git a/findutils.spec b/findutils.spec index a125fe9..d4623d9 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ # # spec file for package findutils # -# 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 @@ -88,7 +88,7 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)" rm -f %{buildroot}%{_infodir}/find-maint* %find_lang %{name} -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p %{buildroot}/bin ln -sf %{_bindir}/find %{buildroot}/bin %endif @@ -103,7 +103,7 @@ rm %{buildroot}%{_mandir}/man5/locatedb.5* %files %license COPYING %doc AUTHORS NEWS README THANKS TODO -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/find %endif %{_bindir}/find