From 07538a33935fd58fa35c729de96deaca2526dc122b09f92d21f049a3cc6961cf Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 25 Jun 2020 10:27:29 +0000 Subject: [PATCH] Accepting request 817028 from home:gmbr3:branches:Base:System3 - Fixes for %_libexecdir changing to /usr/libexec OBS-URL: https://build.opensuse.org/request/show/817028 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=211 --- dhcp.changes | 5 +++++ dhcp.spec | 1 + dhcpd.service | 4 ++-- dhcpd6.service | 4 ++-- dhcrelay.service | 4 ++-- dhcrelay6.service | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index fced60f..5ca9282 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -3,6 +3,11 @@ Tue Jun 23 15:22:00 UTC 2020 - Cristian Rodríguez - insserv is not required anymore +------------------------------------------------------------------- +Thu Jun 11 15:46:50 UTC 2020 - Callum Farmer + +- Fixes for %_libexecdir changing to /usr/libexec + ------------------------------------------------------------------- Wed Apr 15 06:32:20 UTC 2020 - Thorsten Kukuk diff --git a/dhcp.spec b/dhcp.spec index 61f8dd1..78fe03a 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -321,6 +321,7 @@ install -m0644 $RPM_SOURCE_DIR/dhcrelay.service \ %{buildroot}%{_unitdir}/dhcrelay.service install -m0644 $RPM_SOURCE_DIR/dhcrelay6.service \ %{buildroot}%{_unitdir}/dhcrelay6.service +sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{buildroot}%{_unitdir}/d* # rcservice links ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd6 diff --git a/dhcpd.service b/dhcpd.service index cc0893e..51d2524 100644 --- a/dhcpd.service +++ b/dhcpd.service @@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target slapd.s [Service] Type=forking Restart=on-abort -ExecStart=/usr/lib/dhcp/dhcpd -4 start -ExecStop=/usr/lib/dhcp/dhcpd -4 stop +ExecStart=@LIBEXECDIR@/dhcp/dhcpd -4 start +ExecStop=@LIBEXECDIR@/dhcp/dhcpd -4 stop [Install] WantedBy=multi-user.target diff --git a/dhcpd6.service b/dhcpd6.service index 9ce68f5..0b62b29 100644 --- a/dhcpd6.service +++ b/dhcpd6.service @@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target slapd.s [Service] Type=forking Restart=on-abort -ExecStart=/usr/lib/dhcp/dhcpd -6 start -ExecStop=/usr/lib/dhcp/dhcpd -6 stop +ExecStart=@LIBEXECDIR@/dhcp/dhcpd -6 start +ExecStop=@LIBEXECDIR@/dhcp/dhcpd -6 stop [Install] WantedBy=multi-user.target diff --git a/dhcrelay.service b/dhcrelay.service index 4f38793..e72c28d 100644 --- a/dhcrelay.service +++ b/dhcrelay.service @@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.se [Service] Type=forking Restart=on-abort -ExecStart=/usr/lib/dhcp/dhcrelay -4 start -ExecStop=/usr/lib/dhcp/dhcrelay -4 stop +ExecStart=@LIBEXECDIR@/dhcp/dhcrelay -4 start +ExecStop=@LIBEXECDIR@/dhcp/dhcrelay -4 stop PIDFile=/var/run/dhcrelay.pid [Install] diff --git a/dhcrelay6.service b/dhcrelay6.service index 8109eae..751a21d 100644 --- a/dhcrelay6.service +++ b/dhcrelay6.service @@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.se [Service] Type=forking Restart=on-abort -ExecStart=/usr/lib/dhcp/dhcrelay -6 start -ExecStop=/usr/lib/dhcp/dhcrelay -6 stop +ExecStart=@LIBEXECDIR@/dhcp/dhcrelay -6 start +ExecStop=@LIBEXECDIR@/dhcp/dhcrelay -6 stop [Install] WantedBy=multi-user.target