diff --git a/rpm.changes b/rpm.changes index 78c903a..ef9f6ce 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:17:31 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller diff --git a/rpm.spec b/rpm.spec index f23e071..726a576 100644 --- a/rpm.spec +++ b/rpm.spec @@ -275,7 +275,7 @@ mkdir -p %{buildroot}/usr/share/locale ln -s ../share/locale %{buildroot}/usr/lib/locale %make_install mkdir -p %{buildroot}/bin -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 ln -s /usr/bin/rpm %{buildroot}/bin/rpm %endif # remove .la file and the static variant of libpopt @@ -391,7 +391,7 @@ fi %license COPYING %doc docs/manual /etc/rpm -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/rpm %endif %{_bindir}/gendiff