From 4a4c4ac15116e2a1eca9db8e4dd228e1acc8ab5d Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 9 Dec 2024 11:16:00 +0800
Subject: [PATCH] adopt to new cmake macro

---
 openscap.spec | 48 ++++++++++++++----------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/openscap.spec b/openscap.spec
index f408f46..32d6343 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -1,15 +1,17 @@
+%undefine __cmake_in_source_build
+
 Name:                      openscap
 Version:                   1.3.9
-Release:                   3
+Release:                   4
 Summary:                   An open source framework in order to provide a interface for using scap
-License:                   LGPLv2+
-URL:                       http://www.open-scap.org
+License:                   LGPL-2.1-or-later
+URL:                       https://www.open-scap.org
 Source0:                   https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
 Patch0:                    openscap-1.3.9-includes.patch
 BuildRequires:             cmake >= 2.6 gcc gcc-c++ swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
 BuildRequires:             rpm-devel libgcrypt-devel pcre2-devel libacl-devel libselinux-devel libcap-devel libblkid-devel
 BuildRequires:             bzip2-devel asciidoc openldap-devel GConf2-devel dbus-devel chrpath libcurl-devel >= 7.12.0
-BuildRequires:             make glib2-devel libyaml-devel xmlsec1-devel xmlsec1-openssl-devel
+BuildRequires:             make glib2-devel libyaml-devel xmlsec1-devel xmlsec1-openssl-devel openssl-devel perl(XML::XPath) python3-pytest
 
 %if %{?_with_check:1}%{!?_with_check:0}
 BuildRequires:             perl-XML-XPath bzip2
@@ -66,45 +68,21 @@ This package includes help documentation and manuals related to openscap.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-mkdir -p build
 
 %build
-cd build
-%cmake -DWITH_PCRE2=ON -DENABLE_DOCS=ON ..
-%make_build
-make docs
+%cmake -DWITH_PCRE2=ON -DENABLE_DOCS=ON
+%cmake_build
 
 %check
 %if %{?_with_check:1}%{!?_with_check:0}
-ctest -V %{?_smp_mflags}
+%ctest -j1 -V -E sce/test_sce_in_ds.sh
 %endif
 
 %install
-cd build
-%make_install
-
-%delete_la
+%cmake_install
 
 pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
 
-cd  $RPM_BUILD_ROOT/usr
-file `find -type f`| grep -w ELF | awk -F":" '{print $1}' | for i in `xargs`
-do
-  chrpath -d $i
-done
-cd -
-
-mkdir -p  $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-echo "%{_libdir}/%{name}" >> $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files
 %license COPYING
 
@@ -117,13 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/openscap/cpe/*
 
 %{_sysconfdir}/bash_completion.d
-%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %{_libdir}/libopenscap.so
 %{_libdir}/libopenscap_sce.so
 %{_libdir}/pkgconfig/*.pc
-
 %{_includedir}/openscap
 
 %files python3
@@ -141,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Mon Dec 09 2024 Funda Wang <fundawang@yeah.net> - 1.3.9-4
+- adopt to new cmake macro
+- drop useless ld.so.conf
+
 * Mon Mar 4 2024 liyanan <liyanan61@h-partners.com> - 1.3.9-3
 - fix implicit declarations due to missing include
 
-- 
Gitee