Made the spec file requirements section copy-paste of the RHEL8 section.
Also cleaned the spec file up from ancient obsoletes.
This commit is contained in:
parent
799a06ef34
commit
16d73258b4
@ -1,6 +1,6 @@
|
|||||||
Name: openscap
|
Name: openscap
|
||||||
Version: 1.3.2
|
Version: 1.3.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?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+
|
||||||
@ -16,21 +16,32 @@ BuildRequires: rpm-devel
|
|||||||
BuildRequires: libgcrypt-devel
|
BuildRequires: libgcrypt-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: libacl-devel
|
BuildRequires: libacl-devel
|
||||||
BuildRequires: libselinux-devel libcap-devel
|
BuildRequires: libselinux-devel
|
||||||
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: libblkid-devel
|
BuildRequires: libblkid-devel
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
BuildRequires: GConf2-devel
|
BuildRequires: GConf2-devel
|
||||||
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: dbus-devel
|
BuildRequires: dbus-devel
|
||||||
%if %{?_with_check:1}%{!?_with_check:0}
|
%if %{?_with_check:1}%{!?_with_check:0}
|
||||||
BuildRequires: perl-XML-XPath
|
BuildRequires: perl-XML-XPath
|
||||||
BuildRequires: bzip2
|
BuildRequires: bzip2
|
||||||
%endif
|
%endif
|
||||||
Obsoletes: python2-openscap
|
Requires: bash
|
||||||
Obsoletes: openscap-content-sectool
|
Requires: bzip2-libs
|
||||||
Obsoletes: openscap-extra-probes
|
Requires: dbus
|
||||||
Obsoletes: openscap-extra-probes-sql
|
Requires: GConf2
|
||||||
|
Requires: glib2
|
||||||
|
Requires: libacl
|
||||||
|
Requires: libblkid
|
||||||
|
Requires: libcap
|
||||||
|
Requires: libselinux
|
||||||
|
Requires: openldap
|
||||||
|
Requires: popt
|
||||||
|
# Fedora has procps-ng, which provides procps
|
||||||
|
Requires: procps
|
||||||
|
|
||||||
%description
|
%description
|
||||||
OpenSCAP is a set of open source libraries providing an easier path
|
OpenSCAP is a set of open source libraries providing an easier path
|
||||||
@ -63,8 +74,6 @@ Summary: OpenSCAP Scanner Tool (oscap)
|
|||||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
Requires: libcurl >= 7.12.0
|
Requires: libcurl >= 7.12.0
|
||||||
BuildRequires: libcurl-devel >= 7.12.0
|
BuildRequires: libcurl-devel >= 7.12.0
|
||||||
Obsoletes: openscap-selinux
|
|
||||||
Obsoletes: openscap-selinux-compat
|
|
||||||
|
|
||||||
%description scanner
|
%description scanner
|
||||||
The %{name}-scanner package contains oscap command-line tool. The oscap
|
The %{name}-scanner package contains oscap command-line tool. The oscap
|
||||||
@ -190,6 +199,10 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
|
|||||||
%{_mandir}/man8/oscap-podman.8*
|
%{_mandir}/man8/oscap-podman.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 09 2020 Matěj Týč <matyc@redhat.com> - 1:1.3.2-5
|
||||||
|
- Made the spec file requirements section copy-paste of the RHEL8 section.
|
||||||
|
- Cleaned the spec file up from ancient obsoletes.
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-4
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user