From 6ce28c3b4b757203e402a5597e865cd681bcb39ca7e55517d9f0dba274aa2f2e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 13 Nov 2019 14:29:51 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=118 --- dnsmasq.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dnsmasq.spec b/dnsmasq.spec index 8f20dd9..5dfefa4 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -52,7 +52,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(libnetfilter_conntrack) BuildRequires: pkgconfig(systemd) Requires(pre): group(nogroup) -%if %with_tftp_user_package +%if %{with tftp_user_package} Requires(pre): user(tftp) %else Requires(pre): /usr/sbin/useradd @@ -123,7 +123,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie" make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts} %pre -%if %without_tftp_user_package +%if %{without tftp_user_package} if ! /usr/bin/getent group tftp >/dev/null; then %{_sbindir}/groupadd -r tftp fi @@ -164,7 +164,7 @@ install -m 644 %SOURCE3 %{buildroot}/%{_sysconfdir}/slp.reg.d/ install -d 755 %{buildroot}/etc/dbus-1/system.d/ install -m 644 dbus/dnsmasq.conf %{buildroot}/etc/dbus-1/system.d/dnsmasq.conf install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service -%if %without_tftp_user_package +%if %{without tftp_user_package} install -d -m 0755 %{buildroot}/srv/tftpboot %endif ln -sf %{_sbindir}/service %{buildroot}/usr/sbin/rcdnsmasq @@ -202,8 +202,9 @@ rm -rf contrib/MacOSX-launchd %{_unitdir}/dnsmasq.service %dir %{_sysconfdir}/dnsmasq.d %config(noreplace) %{_sysconfdir}/dnsmasq.d/trust-anchors.conf - +%if %{without tftp_user_package} %dir %attr(0755,tftp,tftp) /srv/tftpboot +%endif %files utils %{_bindir}/dhcp_*