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

Accepting request 486359 from home:jengelh:branches:security

Browse Source 
- 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
This commit is contained in:
Marcus Meissner 2017-04-07 11:11:30 +00:00 committed by Git OBS Bridge
parent 75f2a2ef28
commit ad166be9c5
2 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openscap.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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

32
openscap.spec
View File

@ -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.*