Merge branch 'c10s' into a10s
This commit is contained in:
commit
dd399dd0ae
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/openscap-1.3.*.tar.gz
|
||||
/openscap-1.4.*.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: openscap
|
||||
Version: 1.3.10
|
||||
Release: 3%{?dist}.alma.1
|
||||
Version: 1.4.0
|
||||
Release: 1%{?dist}.alma.1
|
||||
Epoch: 1
|
||||
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||
License: LGPL-2.1-or-later
|
||||
@ -39,6 +39,7 @@ BuildRequires: libyaml-devel
|
||||
BuildRequires: xmlsec1-devel
|
||||
BuildRequires: xmlsec1-openssl-devel
|
||||
BuildRequires: procps-devel
|
||||
BuildRequires: python3-devel
|
||||
|
||||
Requires: bash
|
||||
Requires: bzip2-libs
|
||||
@ -54,35 +55,11 @@ Requires: procps
|
||||
Requires: xmlsec1
|
||||
Requires: xmlsec1-openssl
|
||||
|
||||
# AlmaLinux patches
|
||||
Patch1000: openscap-1.3.5-almalinux.patch
|
||||
|
||||
%description %{common_description}
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: libxml2-devel
|
||||
Requires: pkgconfig
|
||||
BuildRequires: doxygen
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
%{common_description}
|
||||
|
||||
%package python3
|
||||
Summary: Python 3 bindings for %{name}
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-openscap }
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
BuildRequires: python-rpm-macros
|
||||
|
||||
%description python3
|
||||
The %{name}-python3 package contains the bindings so that %{name}
|
||||
libraries can be used by python3.
|
||||
%{common_description}
|
||||
|
||||
%package scanner
|
||||
Summary: OpenSCAP Scanner Tool (oscap)
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
@ -117,33 +94,20 @@ engine allows content authors to avoid OVAL language and write their assessment
|
||||
commands using a scripting language (Bash, Perl, Python, Ruby, ...).
|
||||
%{common_description}
|
||||
|
||||
%package engine-sce-devel
|
||||
Summary: Development files for %{name}-engine-sce
|
||||
Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-engine-sce%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description engine-sce-devel
|
||||
The %{name}-engine-sce-devel package contains libraries and header files
|
||||
for developing applications that use %{name}-engine-sce.
|
||||
%{common_description}
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-DWITH_CRYPTO=nss \
|
||||
-DWITH_PCRE2=ON \
|
||||
-DENABLE_DOCS=ON \
|
||||
-DENABLE_PERL=OFF \
|
||||
-DENABLE_PYTHON3=OFF \
|
||||
-DENABLE_OSCAP_UTIL_DOCKER=OFF \
|
||||
-DENABLE_OSCAP_REMEDIATE_SERVICE=OFF \
|
||||
-DOPENSCAP_PROBE_LINUX_DPKGINFO=OFF \
|
||||
-DOPENSCAP_PROBE_UNIX_GCONF=OFF \
|
||||
-DOPENSCAP_ENABLE_SHA1=OFF \
|
||||
-DOPENSCAP_ENABLE_MD5=OFF \
|
||||
-DGCONF_LIBRARY=
|
||||
-DOPENSCAP_ENABLE_MD5=OFF
|
||||
%cmake_build
|
||||
make docs
|
||||
|
||||
@ -155,10 +119,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
# fix python shebangs
|
||||
%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -i %{__python3} -p -n %{buildroot}%{_bindir}/scap-as-rpm
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS NEWS README.md
|
||||
%license COPYING
|
||||
@ -171,27 +133,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
%{_datadir}/openscap/schemas/*
|
||||
%{_datadir}/openscap/xsl/*
|
||||
%{_datadir}/openscap/cpe/*
|
||||
|
||||
|
||||
%files python3
|
||||
%{python3_sitearch}/*
|
||||
|
||||
|
||||
%files devel
|
||||
%doc %{_pkgdocdir}/html/
|
||||
%{_libdir}/libopenscap.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_includedir}/openscap
|
||||
%exclude %{_includedir}/openscap/sce_engine_api.h
|
||||
|
||||
%exclude %{_libdir}/libopenscap.so
|
||||
%exclude %{_libdir}/pkgconfig/*.pc
|
||||
%exclude %{_includedir}/openscap
|
||||
%exclude %{_pkgdocdir}/html/
|
||||
|
||||
%files engine-sce
|
||||
%{_libdir}/libopenscap_sce.so.*
|
||||
|
||||
%files engine-sce-devel
|
||||
%{_libdir}/libopenscap_sce.so
|
||||
%{_includedir}/openscap/sce_engine_api.h
|
||||
|
||||
%exclude %{_libdir}/libopenscap_sce.so
|
||||
|
||||
%files scanner
|
||||
%{_mandir}/man8/oscap.8*
|
||||
@ -200,23 +149,24 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
%{_bindir}/oscap-chroot
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
|
||||
|
||||
%files utils
|
||||
%doc docs/oscap-scan.cron
|
||||
%{_mandir}/man8/*
|
||||
%exclude %{_mandir}/man8/oscap.8*
|
||||
%exclude %{_mandir}/man8/oscap-docker.8*
|
||||
%exclude %{_mandir}/man8/oscap-chroot.8*
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/oscap
|
||||
%exclude %{_bindir}/oscap-docker
|
||||
%exclude %{_bindir}/oscap-chroot
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.3.10-3.alma.1
|
||||
* Tue Sep 03 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.4.0-1.alma.1
|
||||
- Add AlmaLinux definitions
|
||||
|
||||
* Thu Aug 01 2024 Jan Černý <jcerny@redhat.com> - 1:1.4.0-1
|
||||
- Update to the latest upstream release (RHEL-53981)
|
||||
- Remove openscap-devel, openscap-engine-sce-devel and openscap-python3 subpackages
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.3.10-3
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (openscap-1.3.10.tar.gz) = 007556b8f020636f6613c2b1192a8b96dfb21b62994a3e257619d48021ad962f95b724c3ac9709a60dbbf7dba8f2499ff8b9b56a7f2d293ca3a8d6ec8107f595
|
||||
SHA512 (openscap-1.4.0.tar.gz) = 93229826010b2034cb03f34f40c875fc667820b5f7c6332778a908aceeb2a15b5151abd0491c167ed83baff0c4bec3aa1425e40702eda8113a6d1885cb356a03
|
||||
|
||||
Loading…
Reference in New Issue
Block a user