[packages/rspamd] - build/install cleanups

baggins baggins at pld-linux.org
Sat Jul 14 23:29:09 CEST 2018


commit d6660ede6592d34d67d31f283bfb4421885fe35b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 14 23:27:58 2018 +0200

    - build/install cleanups

 rspamd.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/rspamd.spec b/rspamd.spec
index af4415a..7d2c4c6 100644
--- a/rspamd.spec
+++ b/rspamd.spec
@@ -31,9 +31,6 @@ Provides:	group(rspamd)
 Provides:	user(rspamd)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# Executable provides rspamd_main, gmime and more
-%define skip_post_check_so librspamd-mime.so.* librspamd-server.so.* librspamd-lua.so.*
-
 %description
 Rspamd is a complex spam filter that allows to estimate messages by
 many rules, statistical data and custom services like URL black lists.
@@ -54,23 +51,26 @@ spam filters:
 %setup -q
 
 %build
-%{__cmake} -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+install -d build
+cd build
+%{__cmake} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DCONFDIR=%{_sysconfdir}/%{name} \
 	-DLIBDIR=%{_libdir} \
-	-DRSPAMD_GROUP=rspamd \
-	-DRSPAMD_USER=rspamd .
+	..
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sysconfdir}/%{name}/{local.d,override.d}}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
 cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
 cp -p %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %SOURCE3 $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -80,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 294 %{name}
 %useradd -u 294 -d /var/lib/%{name} -g %{name} -c "rspamd User" %{name}
 
-
 %postun
 /sbin/ldconfig
 if [ "$1" = "0" ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rspamd.git/commitdiff/e534154a1ff874d5dc607f90debfbcd47133a5e6



More information about the pld-cvs-commit mailing list