From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 12 Mar 2021 21:13:53 +0000 (+0100)
Subject: - fix sysctl location
X-Git-Tag: auto/th/util-vserver-0.30.216-1.pre3126.5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-vserver.git;a=commitdiff_plain;h=bd7cf93

- fix sysctl location
- ignore build doc build failure, exit code is bogus
---

diff --git a/util-vserver.spec b/util-vserver.spec
index 0c5fcfd..4e44408 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -478,6 +478,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 	--enable-apis=NOLEGACY \
 	--with-initscripts=sysv \
 	--%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
+	SYSTEMD_SYSCTLDIR=%{_prefix}/lib/sysctl.d \
 	FSCK=/sbin/fsck \
 	IONICE=%{_usrbin}/ionice \
 	IP=/sbin/ip \
@@ -498,7 +499,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 
 %{__make} all
 
-%{?with_doc:%{__make} doc}
+%{?with_doc:%{__make} doc || :}
 
 %{__make} -C vproc-%{vproc_version} \
 	CC="%{__cc}" \