Update spec file

Get rid of epoch
Add libyaml dependency
Add make build dependency

Resolves: RHBZ#1997829
This commit is contained in:
Evgeny Kolesnikov 2021-08-25 23:10:36 +02:00
parent 3eabeb8264
commit 31a6dd97cb

View File

@ -1,7 +1,6 @@
Name: openscap Name: openscap
Version: 1.3.5 Version: 1.3.5
Release: 6%{?dist} Release: 7%{?dist}
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+
URL: http://www.open-scap.org/ URL: http://www.open-scap.org/
@ -16,6 +15,7 @@ Patch7: openscap-1.3.6-yamlfile-null-pr-1756.patch
Patch8: openscap-1.3.6-coverity-issues-pr-1748.patch Patch8: openscap-1.3.6-coverity-issues-pr-1748.patch
Patch9: openscap-1.3.6-coverity-issues-pr-1778.patch Patch9: openscap-1.3.6-coverity-issues-pr-1778.patch
Patch10: openscap-1.3.6-disable-sha1-md5-pr-1781.patch Patch10: openscap-1.3.6-disable-sha1-md5-pr-1781.patch
BuildRequires: make
BuildRequires: cmake >= 2.6 BuildRequires: cmake >= 2.6
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -41,6 +41,7 @@ BuildRequires: bzip2
Requires: bash Requires: bash
Requires: bzip2-libs Requires: bzip2-libs
Requires: dbus Requires: dbus
Requires: libyaml
Requires: glib2 Requires: glib2
Requires: libacl Requires: libacl
Requires: libblkid Requires: libblkid
@ -48,7 +49,7 @@ Requires: libcap
Requires: libselinux Requires: libselinux
Requires: openldap Requires: openldap
Requires: popt Requires: popt
# Fedora has procps-ng, which provides procps # We have procps-ng, which provides procps
Requires: procps Requires: procps
Requires: xmlsec1 xmlsec1-openssl Requires: xmlsec1 xmlsec1-openssl
@ -60,7 +61,7 @@ for the expression of Computer Network Defense related information.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libxml2-devel Requires: libxml2-devel
Requires: pkgconfig Requires: pkgconfig
BuildRequires: doxygen BuildRequires: doxygen
@ -71,7 +72,7 @@ developing applications that use %{name}.
%package python3 %package python3
Summary: Python 3 bindings for %{name} Summary: Python 3 bindings for %{name}
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: python3-devel BuildRequires: python3-devel
%description python3 %description python3
@ -80,7 +81,7 @@ libraries can be used by python3.
%package scanner %package scanner
Summary: OpenSCAP Scanner Tool (oscap) Summary: OpenSCAP Scanner Tool (oscap)
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libcurl >= 7.12.0 Requires: libcurl >= 7.12.0
BuildRequires: libcurl-devel >= 7.12.0 BuildRequires: libcurl-devel >= 7.12.0
@ -91,9 +92,10 @@ compliance checking using SCAP content.
%package utils %package utils
Summary: OpenSCAP Utilities Summary: OpenSCAP Utilities
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: rpmdevtools rpm-build Requires: rpmdevtools rpm-build
Requires: %{name}-scanner%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-scanner%{?_isa} = %{version}-%{release}
Requires: bash
%description utils %description utils
The %{name}-utils package contains command-line tools build on top The %{name}-utils package contains command-line tools build on top
@ -102,7 +104,7 @@ tool which is now separated to %{name}-scanner sub-package.
%package engine-sce %package engine-sce
Summary: Script Check Engine plug-in for OpenSCAP Summary: Script Check Engine plug-in for OpenSCAP
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description engine-sce %description engine-sce
The Script Check Engine is non-standard extension to SCAP protocol. This The Script Check Engine is non-standard extension to SCAP protocol. This
@ -111,8 +113,8 @@ commands using a scripting language (Bash, Perl, Python, Ruby, ...).
%package engine-sce-devel %package engine-sce-devel
Summary: Development files for %{name}-engine-sce Summary: Development files for %{name}-engine-sce
Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: %{name}-engine-sce%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-engine-sce%{?_isa} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
%description engine-sce-devel %description engine-sce-devel
@ -126,12 +128,12 @@ for developing applications that use %{name}-engine-sce.
# gconf is a legacy system not used any more, and it blocks testing of oscap-anaconda-addon # gconf is a legacy system not used any more, and it blocks testing of oscap-anaconda-addon
# as gconf is no longer part of the installation medium # as gconf is no longer part of the installation medium
%cmake \ %cmake \
-DOPENSCAP_ENABLE_SHA1=OFF \
-DOPENSCAP_ENABLE_MD5=OFF \
-DENABLE_PERL=OFF \
-DENABLE_DOCS=ON \ -DENABLE_DOCS=ON \
-DENABLE_PERL=OFF \
-DENABLE_OSCAP_UTIL_DOCKER=OFF \ -DENABLE_OSCAP_UTIL_DOCKER=OFF \
-DOPENSCAP_PROBE_UNIX_GCONF=OFF \ -DOPENSCAP_PROBE_UNIX_GCONF=OFF \
-DOPENSCAP_ENABLE_SHA1=OFF \
-DOPENSCAP_ENABLE_MD5=OFF \
-DGCONF_LIBRARY= -DGCONF_LIBRARY=
%cmake_build %cmake_build
make docs make docs
@ -203,6 +205,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
%{_bindir}/oscap-run-sce-script %{_bindir}/oscap-run-sce-script
%changelog %changelog
* Tue Aug 24 2021 Evgenii Kolesnikov <ekolesni@redhat.com> - 1:1.3.5-7
- Update package spec file
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.3.5-6 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.3.5-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688