From 7f0764d69dc589c62040df892412fd4b8514a3294a4f9854d328734199ce23a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Frisch Date: Thu, 29 Feb 2024 14:59:41 +0000 Subject: [PATCH] Accepting request 1153020 from home:jaimeMF:branches:security - Use the correct documentation's path. OBS-URL: https://build.opensuse.org/request/show/1153020 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=288 --- openscap-rpmlintrc | 2 +- openscap.changes | 5 +++++ openscap.spec | 10 +++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/openscap-rpmlintrc b/openscap-rpmlintrc index f767a0f..ba0f4a7 100644 --- a/openscap-rpmlintrc +++ b/openscap-rpmlintrc @@ -1,4 +1,4 @@ # can not change docs implementation -addFilter("files-duplicate /usr/share/doc/openscap/html/search") +addFilter("files-duplicate /usr/share/doc/packages/openscap/html/search") # ignore duplicates in different schema versions addFilter("files-duplicate /usr/share/openscap/schemas") diff --git a/openscap.changes b/openscap.changes index 15dce6e..a0a908e 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 22:23:26 UTC 2024 - Jaime Marquínez Ferrándiz + +- Use the correct documentation's path. + ------------------------------------------------------------------- Thu Sep 21 19:43:34 UTC 2023 - Andreas Stieger diff --git a/openscap.spec b/openscap.spec index a65a4d6..bc49a01 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,7 +1,7 @@ # # spec file for package openscap # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -186,6 +186,9 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP. %build %cmake \ -DENABLE_DOCS=TRUE \ +%if 0%{?suse_version} < 1600 + -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \ +%endif -DCMAKE_SHARED_LINKER_FLAGS="" \ -DENABLE_OSCAP_REMEDIATE_SERVICE=TRUE \ -DWITH_PCRE2=ON \ @@ -282,10 +285,11 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir} %{_libdir}/libopenscap.so.%{sover}* %files devel -%dir %{_datadir}/doc/openscap +%dir %{_docdir}/openscap +%{_docdir}/openscap/html +%{_docdir}/openscap/manual %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_datadir}/doc/openscap/* %{_includedir}/* %files docker