From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 3 Jun 2024 12:59:08 +0000 (+0200)
Subject: Adapt RH packaging
X-Git-Tag: rec-5.2.0-alpha0~3^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e08fd4da8352154ce3d3c453514ce326c23ceb15;p=thirdparty%2Fpdns.git

Adapt RH packaging
---

diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index cbb5c19426..cd0a4637db 100644
--- a/builder-support/specs/pdns-recursor.spec
+++ b/builder-support/specs/pdns-recursor.spec
@@ -81,14 +81,14 @@ make %{?_smp_mflags} check || (cat test-suite.log && false)
 %install
 make install DESTDIR=%{buildroot}
 
-%{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf{-dist,}
+%{__cp} %{buildroot}%{_sysconfdir}/%{name}/recursor.{yml-dist,conf}
 %{__mkdir} %{buildroot}%{_sysconfdir}/%{name}/recursor.d
 
 # 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!' \
+    -e 's/# \(.*setuid: \).*/\1pdns-recursor/' \
+    -e 's/# \(.*setgid: \).*/\1pdns-recursor/' \
+    -e 's!# \(.*include_dir: \).*!\1%{_sysconfdir}/%{name}/recursor.d!' \
     %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
 
 %{__install } -d %{buildroot}/%{_sharedstatedir}/%{name}