From 882fac006386216a93077b59ad2059728a8f4f072f90796ee15a6c56c6ec917a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 20 May 2020 09:49:23 +0000 Subject: [PATCH] Accepting request 807367 from home:dimstar:Factory - Fixup previous fix: use the defined macro %_unitdir for the systemd unit. OBS-URL: https://build.opensuse.org/request/show/807367 OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=58 --- ppp.changes | 6 ++++++ ppp.spec | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ppp.changes b/ppp.changes index e088f38..99a5d65 100644 --- a/ppp.changes +++ b/ppp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 19 15:40:26 UTC 2020 - Dominique Leuenberger + +- Fixup previous fix: use the defined macro %_unitdir for the + systemd unit. + ------------------------------------------------------------------- Thu May 7 07:42:50 UTC 2020 - pgajdos@suse.com diff --git a/ppp.spec b/ppp.spec index eca5726..37f257e 100644 --- a/ppp.spec +++ b/ppp.spec @@ -184,7 +184,7 @@ install -d 755 %{buildroot}%{_sysconfdir}/pam.d install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp install -m 644 %{SOURCE13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz install -Dm 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/chatscripts/modem.chat -install -Dm 644 %{SOURCE15} %{buildroot}/usr/lib/systemd/system/modem@.service +install -Dm 644 %{SOURCE15} %{buildroot}%{_unitdir}/modem@.service install -Dm 644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/90-modem.rules %if 0%{?suse_version} < 1330 @@ -220,8 +220,7 @@ getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group} %config(noreplace) %{_sysconfdir}/ppp/peers/modem %dir %{_sysconfdir}/ppp/chatscripts %config(noreplace) %{_sysconfdir}/ppp/chatscripts/modem.chat -%dir /usr/lib/systemd/system -/usr/lib/systemd/system/modem@.service +%{_unitdir}/modem@.service %dir %{_udevrulesdir} %{_udevrulesdir}/90-modem.rules