From: Frank Louwers <frank@louwers.be>
Date: Thu, 7 Jul 2022 17:30:48 +0000 (+0200)
Subject: Enable include-dir by default in RPM builds, to be in line with DEB builds
X-Git-Tag: rec-4.9.0-alpha0~31^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d17618e9a7c3e1461b5a87f92261bf364e7bda3;p=thirdparty%2Fpdns.git

Enable include-dir by default in RPM builds, to be in line with DEB builds

Closes #11766
---

diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index 983312690e..0f7121336b 100644
--- a/builder-support/specs/pdns-recursor.spec
+++ b/builder-support/specs/pdns-recursor.spec
@@ -44,7 +44,7 @@ package if you need a dns cache for your network.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION} 
+%autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION}
 
 %build
 %if 0%{?rhel} < 8
@@ -76,10 +76,11 @@ make install DESTDIR=%{buildroot}
 
 %{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf{-dist,}
 
-# change user and group to pdns-recursor
+# change user and group to pdns-recursor and add default include-dir
 sed -i \
     -e 's/# setuid=/setuid=pdns-recursor/' \
     -e 's/# setgid=/setgid=pdns-recursor/' \
+    -e 's!# include-dir=.*!&\ninclude-dir=%{_sysconfdir}/%{name}/recursor.d!' \
     %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
 
 # The EL7 and 8 systemd actually supports %t, but its version number is older than that, so we do use seperate runtime dirs, but don't rely on RUNTIME_DIRECTORY
@@ -115,5 +116,6 @@ systemctl daemon-reload ||:
 %{_unitdir}/pdns-recursor.service
 %{_unitdir}/pdns-recursor@.service
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/recursor.d
 %config(noreplace) %{_sysconfdir}/%{name}/recursor.conf
 %doc README