Accepting request 969286 from home:jengelh:branches:security

- Drop buildrequire on C++ compiler. (can't find anything that uses it)
- Modernize specfile constructs.

OBS-URL: https://build.opensuse.org/request/show/969286
OBS-URL: https://build.opensuse.org/package/show/security/audit?expand=0&rev=139
This commit is contained in:
Marcus Meissner 2022-04-12 14:18:42 +00:00 committed by Git OBS Bridge
parent 26999f1942
commit 4a3ef5cf8e
4 changed files with 20 additions and 13 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 11 20:44:34 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Drop buildrequire on C++ compiler.
- Modernize specfile constructs.
-------------------------------------------------------------------
Sat Mar 26 11:14:19 UTC 2022 - Stephan Kulow <coolo@suse.com>

View File

@ -46,7 +46,6 @@ Patch13: audisp-remote-fix-hang-with-disk_low_action-suspend-.patch
Patch14: libaudit-fix-unhandled-ECONNREFUSED-from-getpwnam-25.patch
BuildRequires: audit-devel = %{version}
BuildRequires: autoconf >= 2.12
BuildRequires: gcc-c++
BuildRequires: kernel-headers >= 2.6.30
BuildRequires: libtool
BuildRequires: openldap2-devel
@ -157,7 +156,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
%{?_with_python3} \
%{?_without_python}
make %{?_smp_mflags}
%make_build
%sysusers_generate_pre %{SOURCE1} audit system-group-audit.conf
@ -212,7 +211,7 @@ chmod 0644 %{buildroot}%{_unitdir}/auditd.service
chmod 0644 %{buildroot}%{_unitdir}/augenrules.service
%check
make %{?_smp_mflags} check
%make_build check
%post -n audit
# Save existing audit files if any (from old locations)
@ -307,7 +306,6 @@ fi
%if %{with python3}
%files -n python3-audit
%defattr(-,root,root,-)
%attr(755,root,root) %{python3_sitearch}/*
%endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 11 20:45:33 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Modernize specfile constructs.
-------------------------------------------------------------------
Sun Nov 7 13:34:20 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -28,7 +28,6 @@ Source1: baselibs.conf
Source2: README-BEFORE-ADDING-PATCHES
Patch0: change-default-log_group.patch
BuildRequires: autoconf >= 2.12
BuildRequires: gcc-c++
BuildRequires: kernel-headers >= 2.6.30
BuildRequires: libtool
BuildRequires: pkgconfig
@ -75,8 +74,7 @@ needed for developing applications that need to use the audit framework
libraries.
%prep
%setup -q
%patch0 -p1
%autosetup -p1
%build
autoreconf -fi
@ -96,10 +94,10 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
--with-python=no \
--disable-zos-remote
make %{?_smp_mflags} -C common
make %{?_smp_mflags} -C lib
make %{?_smp_mflags} -C auparse
make %{?_smp_mflags} -C docs
%make_build -C common
%make_build -C lib
%make_build -C auparse
%make_build -C docs
%install
%make_install -C common
@ -120,8 +118,8 @@ install -m 0644 init.d/libaudit.conf %{buildroot}%{_sysconfdir}
find %{buildroot} -type f -name "*.la" -delete -print
%check
make %{?_smp_mflags} check -C lib
make %{?_smp_mflags} check -C auparse
%make_build -C lib check
%make_build -C auparse check
%post -n libaudit1 -p /sbin/ldconfig
%post -n libauparse0 -p /sbin/ldconfig