From a4ec89c0bbda9023d4a9e074d687051d41d8b6a3 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 20 Jul 2020 18:50:27 -0400 Subject: [PATCH] use cmake_build and DESTDIR="/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-6.fc33.x86_64" /usr/bin/cmake --install "." Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index b409bd1..ae522d8 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -1,6 +1,5 @@ %global _hardened_build 1 -%global __cmake_in_source_build 1 %if ( 0%{?suse_version} ) BuildRequires: distribution-release @@ -116,7 +115,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.3 -Release: 5%{?dev:%{dev}}%{?dist} +Release: 6%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki @@ -529,7 +528,8 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DALLOCATOR=jemalloc %endif -make VERBOSE=1 %{?_smp_mflags} || make %{?_smp_mflags} || make +export VERBOSE=1 +%cmake_build %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) make -C selinux -f /usr/share/selinux/devel/Makefile ganesha.pp @@ -603,7 +603,7 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g install -m 644 config_samples/gpfs.ganesha.exports.conf %{buildroot}%{_sysconfdir}/ganesha %endif -%make_install +%cmake_install %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) install -d %{buildroot}%{_selinux_store_path}/packages @@ -861,6 +861,9 @@ exit 0 %endif %changelog +* Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-6 +- use cmake_build and %cmake_install + * Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-5 - use %make_install