diff --git a/audit-secondary.changes b/audit-secondary.changes index 5a41a9b..f1c1137 100644 --- a/audit-secondary.changes +++ b/audit-secondary.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:21:56 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Thu Dec 15 19:17:35 UTC 2022 - Enzo Matsumiya diff --git a/audit-secondary.spec b/audit-secondary.spec index 4481040..1315a16 100644 --- a/audit-secondary.spec +++ b/audit-secondary.spec @@ -1,7 +1,7 @@ # # spec file for package audit-secondary # -# 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 @@ -199,7 +199,7 @@ rm -f %{buildroot}/%{_mandir}/man5/libaudit.conf.5 rm -rf %{buildroot}/%{_mandir}/man3 # Cleanup plugins #USR-MERGE -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir %{buildroot}/sbin/ for prog in auditctl auditd ausearch autrace aureport augenrules; do ln -s %{_sbindir}/$prog %{buildroot}/sbin/$prog @@ -258,7 +258,7 @@ fi %attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz %attr(644,root,root) %{_mandir}/man8/auvirt.8.gz %attr(644,root,root) %{_mandir}/man8/augenrules.8.gz -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/auditctl /sbin/auditd /sbin/ausearch diff --git a/audit.spec b/audit.spec index 4e077bb..ac8a617 100644 --- a/audit.spec +++ b/audit.spec @@ -1,7 +1,7 @@ # # spec file for package audit # -# 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