rpm/audit
SHA256
1
0
Fork 0
forked from pool/audit
Code Pull Requests Activity

Accepting request 1051400 from home:lnussel:usrmerge

Browse Source 
- Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1051400
OBS-URL: https://build.opensuse.org/package/show/security/audit?expand=0&rev=142
This commit is contained in:
Robert Frohl 2023-01-31 13:00:20 +00:00 committed by Git OBS Bridge
parent 7e1b0e83b8
commit 70202c4f18
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audit-secondary.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:21:56 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 15 19:17:35 UTC 2022 - Enzo Matsumiya <ematsumiya@suse.de> Thu Dec 15 19:17:35 UTC 2022 - Enzo Matsumiya <ematsumiya@suse.de>

6
audit-secondary.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package audit-secondary # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 rm -rf %{buildroot}/%{_mandir}/man3
# Cleanup plugins # Cleanup plugins
#USR-MERGE #USR-MERGE
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
mkdir %{buildroot}/sbin/ mkdir %{buildroot}/sbin/
for prog in auditctl auditd ausearch autrace aureport augenrules; do for prog in auditctl auditd ausearch autrace aureport augenrules; do
ln -s %{_sbindir}/$prog %{buildroot}/sbin/$prog 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}/man5/ausearch-expression.5.gz
%attr(644,root,root) %{_mandir}/man8/auvirt.8.gz %attr(644,root,root) %{_mandir}/man8/auvirt.8.gz
%attr(644,root,root) %{_mandir}/man8/augenrules.8.gz %attr(644,root,root) %{_mandir}/man8/augenrules.8.gz
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/auditctl /sbin/auditctl
/sbin/auditd /sbin/auditd
/sbin/ausearch /sbin/ausearch

2
audit.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package audit # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed