From bd647b03ac0aaa931e712fb5faa55017b96ac21c Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Thu, 14 Nov 2024 21:51:27 +0800
Subject: [PATCH] adopt to new cmake macro

---
 pki-core.spec | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pki-core.spec b/pki-core.spec
index 323d6af..2feb953 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -1,12 +1,13 @@
+%undefine __cmake_in_source_build
 %define package_option() %bcond_with %1
 %define _unpackaged_files_terminate_build 0
 
 Name:                pki-core
 Version:             11.0.0
-Release:             8
+Release:             9
 Summary:             The PKI Core Package
 License:             GPLv2 and LGPLv2
-URL:                 http://www.dogtagpki.org/
+URL:                 https://www.dogtagpki.org/
 Source0:             https://github.com/dogtagpki/pki/archive/v%{version}/pki-v%{version}.tar.gz
 Source1:             https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
 
@@ -222,9 +223,8 @@ mkdir -p ${HOME}/rpmbuild/bin/
 cd go-md2man-*
 go build -mod=vendor -o ${HOME}/rpmbuild/bin/
 cd -
-mkdir -p build
-cd build
 
+export PATH=$PATH:${HOME}/rpmbuild/bin/
 %cmake \
     --no-warn-unused-cli -DVERSION=%{version}-%{release} \
     -DVAR_INSTALL_DIR:PATH=/var -DJAVA_HOME=${java_home} \
@@ -236,17 +236,14 @@ cd build
     -DWITH_PYTHON2:BOOL=OFF -DWITH_PYTHON3:BOOL=ON \
     -DWITH_PYTHON3_DEFAULT:BOOL=ON -DPYTHON_EXECUTABLE=%{__python3} \
     -DWITH_TEST:BOOL=ON -DWITH_JAVADOC:BOOL=ON \
-    -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:OFF} -DTHEME= \
-    ..
+    -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:OFF} -DTHEME=
+
+%cmake_build
 
 %install
 export PATH=$PATH:${HOME}/rpmbuild/bin/
-cd build
-%make_build \
-    VERBOSE=%{?_verbose} CMAKE_NO_VERBOSE=1 \
-    DESTDIR=%{buildroot} INSTALL="install -p" \
-    --no-print-directory \
-    all install
+%cmake_install
+
     ln -sf /usr/share/java/jboss-logging/jboss-logging.jar\
     %{buildroot}%{_datadir}/pki/lib/jboss-logging.jar
     ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar\
@@ -457,6 +454,10 @@ fi
 %endif
 
 %changelog
+* Thu Nov 14 2024 Funda Wang <fundawang@yeah.net> - 11.0.0-9
+- adopt to new cmake macro
+- force out-of-source build
+
 * Sun Oct 13 2024 liningjie <liningjie@xfusion.com> - 11.0.0-8
 - Fix CVE-2023-4727
 
-- 
Gitee