Revert Epoch removal

We can't remove Epoch, because the new build (without Epoch) was recognized
as older build and it could not be added to the erratum and it could
not be upgraded to the new build.

Resolves: RHBZ#1997829
This commit is contained in:
Jan Černý 2021-08-27 15:59:53 +02:00
parent 31a6dd97cb
commit 2e6b0b2576

View File

@ -1,6 +1,7 @@
Name: openscap Name: openscap
Version: 1.3.5 Version: 1.3.5
Release: 7%{?dist} Release: 8%{?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/
@ -61,7 +62,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} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libxml2-devel Requires: libxml2-devel
Requires: pkgconfig Requires: pkgconfig
BuildRequires: doxygen BuildRequires: doxygen
@ -72,7 +73,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} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
BuildRequires: python3-devel BuildRequires: python3-devel
%description python3 %description python3
@ -81,7 +82,7 @@ libraries can be used by python3.
%package scanner %package scanner
Summary: OpenSCAP Scanner Tool (oscap) Summary: OpenSCAP Scanner Tool (oscap)
Requires: %{name}%{?_isa} = %{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
@ -92,9 +93,9 @@ compliance checking using SCAP content.
%package utils %package utils
Summary: OpenSCAP Utilities Summary: OpenSCAP Utilities
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: rpmdevtools rpm-build Requires: rpmdevtools rpm-build
Requires: %{name}-scanner%{?_isa} = %{version}-%{release} Requires: %{name}-scanner%{?_isa} = %{epoch}:%{version}-%{release}
Requires: bash Requires: bash
%description utils %description utils
@ -104,7 +105,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} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{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
@ -113,8 +114,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} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-engine-sce%{?_isa} = %{version}-%{release} Requires: %{name}-engine-sce%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
%description engine-sce-devel %description engine-sce-devel
@ -205,6 +206,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
* Fri Aug 27 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-8
- Revert Epoch removal
* Tue Aug 24 2021 Evgenii Kolesnikov <ekolesni@redhat.com> - 1:1.3.5-7 * Tue Aug 24 2021 Evgenii Kolesnikov <ekolesni@redhat.com> - 1:1.3.5-7
- Update package spec file - Update package spec file