From deb329e2269476e25f18fca5c6b274822e90664875e7a1f7b3458e7303bf5fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 22 Feb 2019 10:44:04 +0000 Subject: [PATCH] Accepting request 678164 from home:fbui:branches:network - Drop use of $FIRST_ARG in .spec The use of $FIRST_ARG was probably required because of the %service_* rpm macros were playing tricks with the shell positional parameters. This is bad practice and error prones so let's assume that no macros should do that anymore and hence it's safe to assume that positional parameters remains unchanged after any rpm macro call. OBS-URL: https://build.opensuse.org/request/show/678164 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=106 --- dnsmasq.changes | 12 ++++++++++++ dnsmasq.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dnsmasq.changes b/dnsmasq.changes index 0100e92..0e19708 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 22 07:10:51 UTC 2019 - Franck Bui + +- Drop use of $FIRST_ARG in .spec + + The use of $FIRST_ARG was probably required because of the + %service_* rpm macros were playing tricks with the shell positional + parameters. This is bad practice and error prones so let's assume + that no macros should do that anymore and hence it's safe to assume + that positional parameters remains unchanged after any rpm macro + call. + ------------------------------------------------------------------- Wed Jan 23 23:03:22 UTC 2019 - Cristian Rodríguez diff --git a/dnsmasq.spec b/dnsmasq.spec index 17d8299..1e2c952 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -136,7 +136,7 @@ fi %postun %service_del_postun %{name}.service # reload dbus after uninstall, our policies are gone again -if [ ${FIRST_ARG:-$1} -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \ +if [ $1 -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \ -a -x /usr/bin/systemctl ]; then /usr/bin/systemctl reload dbus.service 2>/dev/null || : fi