From ad166be9c52488948c91ca6b11f450c8190f4b79c642b8998eff0dd1d01b0996 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 7 Apr 2017 11:11:30 +0000 Subject: [PATCH] Accepting request 486359 from home:jengelh:branches:security - Remove line-trailing whitespace from last changelog entry. - Rename %soname to %sover to better reflect its use. OBS-URL: https://build.opensuse.org/request/show/486359 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=180 --- openscap.changes | 63 +++++++++++++++++++++++++++--------------------- openscap.spec | 32 ++++++++++++------------ 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/openscap.changes b/openscap.changes index 48b18dd..d048d89 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,35 +1,42 @@ +------------------------------------------------------------------- +Fri Apr 7 09:35:00 UTC 2017 - jengelh@inai.de + +- Remove line-trailing whitespace from last changelog entry. +- Rename %soname to %sover to better reflect its use. +- Replace unnecessary %__-type macro indirections. + ------------------------------------------------------------------- Tue Mar 21 12:20:23 UTC 2017 - meissner@suse.com - openscap-1.2.14 / 21-03-2017 - - New features - - Detailed information about ARF files in 'oscap info' (issue #664) - - XSLT template creating XCCDF files from OVAL files - - Generating remediation scripts from ARF - - Significant improvements of User Manual (issue #249, #513) - - HTML report UX improvements (issue #601, #620, #622, #655) - - Warnings are shown by default - - Verbose mode is available in 'xccdf remediate' module (issue #520) - - Added Fedora 26, Fedora 27 and OpenSUSE 42.2 CPEs (issue #698) - - Support for Anaconda remediation in HTML report - - Maintenance - - Fixed CPE dictionary to identify RHEVH as RHEL7 (RHBZ #1420038) - - Fixed systemd probes crashes inside containers (RHBZ #1431186, issue #700) - - Added a warning on non-existing XCCDF Benchmarks (issue #614) - - Fixed output on terminals with white background (RHBZ #1365911, issue #512) - - Error handling in oscap-vm (RHBZ #1391754) - - Fixed SCE stderr stalling (RHBZ #1420811) - - Fixed Android OVAL schema (issue #279) - - Fixed absolute filepath parsing in OVAL (RHBZ #1312831, #1312824) - - Fixes based on Coverity scan report (issue #581, #634, #681) - - Fixed duplicated error messages (issue #707) - - Fixed XCCDF score calculation (issue #617) - - Fixed segmentation faults in RPM probes (RHBZ #1414303, #1414312) - - Fixed failing DataStream build if "@" is in filepath - - Fixed missing header in result-oriented Ansible remediations - - Memory leak and resource leak fixes (issue #635, #636) - - New upstream tests - - Many minor fixes and improvements + - New features + - Detailed information about ARF files in 'oscap info' (issue #664) + - XSLT template creating XCCDF files from OVAL files + - Generating remediation scripts from ARF + - Significant improvements of User Manual (issue #249, #513) + - HTML report UX improvements (issue #601, #620, #622, #655) + - Warnings are shown by default + - Verbose mode is available in 'xccdf remediate' module (issue #520) + - Added Fedora 26, Fedora 27 and OpenSUSE 42.2 CPEs (issue #698) + - Support for Anaconda remediation in HTML report + - Maintenance + - Fixed CPE dictionary to identify RHEVH as RHEL7 (RHBZ #1420038) + - Fixed systemd probes crashes inside containers (RHBZ #1431186, issue #700) + - Added a warning on non-existing XCCDF Benchmarks (issue #614) + - Fixed output on terminals with white background (RHBZ #1365911, issue #512) + - Error handling in oscap-vm (RHBZ #1391754) + - Fixed SCE stderr stalling (RHBZ #1420811) + - Fixed Android OVAL schema (issue #279) + - Fixed absolute filepath parsing in OVAL (RHBZ #1312831, #1312824) + - Fixes based on Coverity scan report (issue #581, #634, #681) + - Fixed duplicated error messages (issue #707) + - Fixed XCCDF score calculation (issue #617) + - Fixed segmentation faults in RPM probes (RHBZ #1414303, #1414312) + - Fixed failing DataStream build if "@" is in filepath + - Fixed missing header in result-oriented Ansible remediations + - Memory leak and resource leak fixes (issue #635, #636) + - New upstream tests + - Many minor fixes and improvements ------------------------------------------------------------------- Fri Jan 6 14:37:37 UTC 2017 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 20d5da3..868ddfa 100644 --- a/openscap.spec +++ b/openscap.spec @@ -16,7 +16,7 @@ # -%define soname 8 +%define sover 8 %define with_bindings 0 Name: openscap @@ -70,11 +70,11 @@ related information. More information about SCAP can be found at nvd.nist.gov. -%package -n libopenscap%{soname} +%package -n libopenscap%{sover} Summary: OpenSCAP C Library Group: System/Libraries -%description -n libopenscap%{soname} +%description -n libopenscap%{sover} The OpenSCAP C Library for easy integration with SCAP. %package docker @@ -92,17 +92,17 @@ Group: System/Libraries %description engine-sce This package contains the Script Checking Engine (SCE) support for OpenSCAP. -%package -n libopenscap_sce%{soname} +%package -n libopenscap_sce%{sover} Summary: Script Checking Engine Library for OpenSCAP Group: System/Libraries Recommends: openscap-engine-sce -%description -n libopenscap_sce%{soname} +%description -n libopenscap_sce%{sover} This package contains the Script Checking Engine Library (SCE) for OpenSCAP. %package devel Requires: %{name} = %{version}-%{release} -Requires: libopenscap%{soname} = %{version} +Requires: libopenscap%{sover} = %{version} Summary: Development Files for OpenSCAP Group: Development/Libraries/C and C++ @@ -174,16 +174,16 @@ bash ./autogen.sh %else %configure --disable-silent-rules --enable-sce --enable-cce --disable-bindings --disable-python --disable-python3 %endif -%__make %{?_smp_mflags} +make %{?_smp_mflags} cd doc doxygen cd .. %check -%__make check %{?_smp_mflags} ||: +make check %{?_smp_mflags} || : %install -%__make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} find %{buildroot} -name "*.la" -delete mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -198,11 +198,11 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/openscap ln -s %{_datadir}/openscap/scap-yast2sec-oval.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-oval.xml ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-xccdf.xml -%post -n libopenscap%{soname} -p /sbin/ldconfig -%post -n libopenscap_sce%{soname} -p /sbin/ldconfig +%post -n libopenscap%{sover} -p /sbin/ldconfig +%post -n libopenscap_sce%{sover} -p /sbin/ldconfig -%postun -n libopenscap%{soname} -p /sbin/ldconfig -%postun -n libopenscap_sce%{soname} -p /sbin/ldconfig +%postun -n libopenscap%{sover} -p /sbin/ldconfig +%postun -n libopenscap_sce%{sover} -p /sbin/ldconfig %preun utils %{stop_on_removal oscap-scan} @@ -260,9 +260,9 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %{_datadir}/openscap/schemas/* %{_datadir}/openscap/xsl/* -%files -n libopenscap%{soname} +%files -n libopenscap%{sover} %defattr(-, root, root) -%{_libdir}/libopenscap.so.%{soname}* +%{_libdir}/libopenscap.so.%{sover}* %files devel %defattr(-, root, root) @@ -310,7 +310,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %dir %{_datadir}/openscap/sectool-sce/ %{_datadir}/openscap/sectool-sce/* -%files -n libopenscap_sce%{soname} +%files -n libopenscap_sce%{sover} %defattr(-,root,root,-) %{_libdir}/libopenscap_sce.so.*