diff --git a/blog.changes b/blog.changes index dd67700..4c33399 100644 --- a/blog.changes +++ b/blog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:23:56 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Fri Dec 3 08:20:08 UTC 2021 - Dr. Werner Fink diff --git a/blog.spec b/blog.spec index 2860bb8..6c16f2e 100644 --- a/blog.spec +++ b/blog.spec @@ -1,7 +1,7 @@ # # spec file for package blog # -# Copyright (c) 2021 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 @@ -92,7 +92,7 @@ make %{?_smp_mflags} CC="%__cc" \ %make_install \ MANPATH=%{_mandir} \ INSTBINFLAGS="-m 0744" \ -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 SBINDIR=%{_sbindir} \ %endif LIBDIR=%{_libdir} \ @@ -121,7 +121,7 @@ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : %defattr(-,root,root) %license COPYING %doc README -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/blogctl /sbin/blogd /sbin/blogger