From 07903acdf1e15ad9bfcc0f6237d110c8850dc63fd4d3c201f65f247ae30e7360 Mon Sep 17 00:00:00 2001
From: Enzo Matsumiya <ematsumiya@suse.com>
Date: Fri, 27 Nov 2020 13:40:00 +0000
Subject: [PATCH] Accepting request 849560 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849560
OBS-URL: https://build.opensuse.org/package/show/security/audit?expand=0&rev=112
---
 audit-secondary.changes |  5 +++++
 audit-secondary.spec    | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/audit-secondary.changes b/audit-secondary.changes
index 74efbd0..dcae2f4 100644
--- a/audit-secondary.changes
+++ b/audit-secondary.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 09:40:34 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Jan 13 17:39:03 UTC 2020 - Tony Jones <tonyj@suse.com>
 
diff --git a/audit-secondary.spec b/audit-secondary.spec
index 3f11838..cab79ca 100644
--- a/audit-secondary.spec
+++ b/audit-secondary.spec
@@ -174,10 +174,12 @@ rm -f %{buildroot}/%{_mandir}/man5/libaudit.conf.5
 rm -rf %{buildroot}/%{_mandir}/man3
 # Cleanup plugins
 #USR-MERGE
+%if !0%{?usrmerged}
 mkdir %{buildroot}/sbin/
 for prog in auditctl auditd ausearch autrace audispd aureport augenrules; do
   ln -s %{_sbindir}/$prog %{buildroot}/sbin/$prog
 done
+%endif
 #END-USR-MERGE
 # rcauditd symlink
 ln -s service %{buildroot}%{_sbindir}/rcauditd
@@ -226,22 +228,24 @@ 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}
 /sbin/auditctl
-%attr(750,root,root) %{_sbindir}/auditctl
 /sbin/auditd
-%attr(750,root,root) %{_sbindir}/auditd
 /sbin/ausearch
-%attr(755,root,root) %{_sbindir}/ausearch
 /sbin/autrace
-%attr(750,root,root) %{_sbindir}/autrace
 /sbin/audispd
-%attr(750,root,root) %{_sbindir}/augenrules
 /sbin/augenrules
+/sbin/aureport
+%endif
+%attr(750,root,root) %{_sbindir}/auditctl
+%attr(750,root,root) %{_sbindir}/auditd
+%attr(755,root,root) %{_sbindir}/ausearch
+%attr(750,root,root) %{_sbindir}/autrace
+%attr(750,root,root) %{_sbindir}/augenrules
 %attr(750,root,root) %{_sbindir}/audispd
 %attr(755,root,root) %{_bindir}/aulast
 %attr(755,root,root) %{_bindir}/aulastlog
 %attr(755,root,root) %{_bindir}/ausyscall
-/sbin/aureport
 %attr(755,root,root) %{_sbindir}/aureport
 %attr(755,root,root) %{_bindir}/auvirt
 %dir %attr(750,root,root) %{_sysconfdir}/audit