rpms/openscap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove containers subpackage

Browse Source 
It removes the oscap-docker completely because it depends on Docker
which has been superseded in RHEL by Podman. This aligns packaging with
RHEL 8, where we also don't have oscap-docker and oscap-podman is
shipped in openscap-utils subpackage.

The patch also moves the man page of oscap-chroot to the same subpackage
where oscap-chroot is shipped.

Resolves: RHBZ#1952789
This commit is contained in:
Jan Černý 2021-05-20 15:43:38 +02:00
parent 4df8036f41
commit 83f314aa21
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
openscap.spec
View File

@ -1,6 +1,6 @@
Name: openscap Name: openscap
Version: 1.3.5 Version: 1.3.5
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Summary: Set of open source libraries enabling integration of the SCAP line of standards Summary: Set of open source libraries enabling integration of the SCAP line of standards
License: LGPLv2+ License: LGPLv2+
@ -111,15 +111,6 @@ Requires: pkgconfig
The %{name}-engine-sce-devel package contains libraries and header files The %{name}-engine-sce-devel package contains libraries and header files
for developing applications that use %{name}-engine-sce. for developing applications that use %{name}-engine-sce.
%package containers
Summary: Utils for scanning containers
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-scanner
BuildArch: noarch
%description containers
Tool for scanning Atomic containers.
%prep %prep
%autosetup -p1 %autosetup -p1
@ -129,6 +120,7 @@ Tool for scanning Atomic containers.
%cmake \ %cmake \
-DENABLE_PERL=OFF \ -DENABLE_PERL=OFF \
-DENABLE_DOCS=ON \ -DENABLE_DOCS=ON \
-DENABLE_OSCAP_UTIL_DOCKER=OFF \
-DOPENSCAP_PROBE_UNIX_GCONF=OFF \ -DOPENSCAP_PROBE_UNIX_GCONF=OFF \
-DGCONF_LIBRARY= -DGCONF_LIBRARY=
%cmake_build %cmake_build
@ -177,32 +169,33 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
%{_includedir}/openscap/sce_engine_api.h %{_includedir}/openscap/sce_engine_api.h
%files scanner %files scanner
%{_mandir}/man8/oscap.8* %{_mandir}/man8/oscap.8.gz
%{_bindir}/oscap %{_bindir}/oscap
%{_mandir}/man8/oscap-chroot.8.gz
%{_bindir}/oscap-chroot %{_bindir}/oscap-chroot
%{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d
%files utils %files utils
%doc docs/oscap-scan.cron %doc docs/oscap-scan.cron
%{_mandir}/man8/* %{_mandir}/man8/oscap-ssh.8.gz
%exclude %{_mandir}/man8/oscap.8* %{_bindir}/oscap-ssh
%exclude %{_mandir}/man8/oscap-docker.8* %{_mandir}/man8/oscap-podman.8.gz
%{_bindir}/* %{_bindir}/oscap-podman
%exclude %{_bindir}/oscap %{_mandir}/man8/oscap-vm.8.gz
%exclude %{_bindir}/oscap-docker %{_bindir}/oscap-vm
%exclude %{_bindir}/oscap-chroot %{_mandir}/man8/scap-as-rpm.8.gz
%{_bindir}/scap-as-rpm
%{_mandir}/man8/autotailor.8.gz
%{_bindir}/autotailor
%files engine-sce %files engine-sce
%{_libdir}/libopenscap_sce.so.* %{_libdir}/libopenscap_sce.so.*
%{_bindir}/oscap-run-sce-script
%files containers
%{_bindir}/oscap-docker
%{_mandir}/man8/oscap-docker.8*
%{python3_sitelib}/oscap_docker_python/*
%{_bindir}/oscap-podman
%{_mandir}/man8/oscap-podman.8*
%changelog %changelog
* Thu May 20 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-2
- Remove containers subpackage
* Fri Apr 23 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-1 * Fri Apr 23 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-1
- Update to the latest upstream release - Update to the latest upstream release