[packages/monkey] - updated cmake usage

qboosh qboosh at pld-linux.org
Sun Jul 12 13:58:54 CEST 2026


commit 50ab43a4f6fe109d867d35e14fa1d8e1b8c7bffc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 12 13:58:14 2026 +0200

    - updated cmake usage

 monkey.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/monkey.spec b/monkey.spec
index 31feeac..44bb465 100644
--- a/monkey.spec
+++ b/monkey.spec
@@ -13,7 +13,7 @@ Source3:	monkeyd.init
 Patch0:		%{name}-cmake-install-paths.patch
 URL:		https://monkey-project.com/
 BuildRequires:	cmake >= 3.20
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.605
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
 Requires(pre):	/bin/id
@@ -56,9 +56,7 @@ Pliki nagłówkowe do tworzenia wtyczek dla serwera HTTP Monkey.
 %patch -P0 -p1
 
 %build
-install -d build
-cd build
-%cmake .. \
+%cmake -B build \
 	-DCMAKE_INSTALL_SBINDIR=%{_sbindir} \
 	-DINSTALL_SYSCONFDIR=%{_sysconfdir} \
 	-DINSTALL_WEBROOTDIR=%{_webdir} \
@@ -67,12 +65,13 @@ cd build
 	-DDEFAULT_USER=http \
 	-DDEFAULT_PORT=80
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C build install DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir},%{_webdir},/etc/rc.d/init.d}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/monkey.service
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/monkey.git/commitdiff/ffae06b787fde5f4a96e8bacf9164f7648740f09



More information about the pld-cvs-commit mailing list