Adapt RH packaging

diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index cbb5c1942661d3f825901c09831166be7914e294..cd0a4637dbc8300ffbb241f0327b9886caaac049 100644 (file)
--- 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}