From c149fdd0d750d15d59a31782371b5d761ee86cb7 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 4 Feb 2025 12:10:11 +0100 Subject: [PATCH] remove %t hack, el8 does not need it --- builder-support/specs/pdns-recursor.spec | 5 ----- builder-support/specs/pdns.spec | 5 ----- 2 files changed, 10 deletions(-) diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec index 30e830144eb5..8559a551f056 100644 --- a/builder-support/specs/pdns-recursor.spec +++ b/builder-support/specs/pdns-recursor.spec @@ -88,11 +88,6 @@ EOF %{__install } -d %{buildroot}/%{_sharedstatedir}/%{name} -# 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 -%if 0%{?rhel} < 9 -sed -e 's!/pdns_recursor!& --socket-dir=%t/pdns-recursor!' -i %{buildroot}/%{_unitdir}/pdns-recursor.service -%endif - %pre getent group pdns-recursor > /dev/null || groupadd -r pdns-recursor getent passwd pdns-recursor > /dev/null || \ diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec index 6acefb4f0421..6674bf371a71 100644 --- a/builder-support/specs/pdns.spec +++ b/builder-support/specs/pdns.spec @@ -218,11 +218,6 @@ chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf %{__install } -d %{buildroot}/%{_sharedstatedir}/%{name} -# 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 -%if 0%{?rhel} < 9 -sed -e 's!/pdns_server!& --socket-dir=%t/pdns!' -i %{buildroot}/%{_unitdir}/pdns.service -%endif - %check PDNS_TEST_NO_IPV6=1 make %{?_smp_mflags} -C pdns check || (cat pdns/test-suite.log && false)