Accepting request 623240 from network
OBS-URL: https://build.opensuse.org/request/show/623240 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dnsmasq?expand=0&rev=66
This commit is contained in:
commit
5bc16c7af7
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 16 10:15:54 CEST 2018 - kukuk@suse.de
|
||||||
|
|
||||||
|
- Don't require systemd explicit, fix spec file to handle both
|
||||||
|
cases correct. In containers we don't have systemd.
|
||||||
|
- Adjust pre/post install for transactional updates.
|
||||||
|
- Use %license instead of %doc [bsc#1082318]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 4 13:39:32 UTC 2017 - idonmez@suse.com
|
Mon Dec 4 13:39:32 UTC 2017 - idonmez@suse.com
|
||||||
|
|
||||||
|
13
dnsmasq.spec
13
dnsmasq.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package dnsmasq
|
# spec file for package dnsmasq
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
Name: dnsmasq
|
Name: dnsmasq
|
||||||
Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
|
Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
|
||||||
License: GPL-2.0 or GPL-3.0
|
License: GPL-2.0-only OR GPL-3.0-only
|
||||||
Group: Productivity/Networking/DNS/Servers
|
Group: Productivity/Networking/DNS/Servers
|
||||||
Version: 2.78
|
Version: 2.78
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -45,7 +45,6 @@ BuildRequires: pkgconfig(libnetfilter_conntrack)
|
|||||||
%if 0%{?suse_version} >= 1210
|
%if 0%{?suse_version} >= 1210
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
%endif
|
%endif
|
||||||
%{?systemd_requires}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
|
Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
|
||||||
@ -122,7 +121,9 @@ fi
|
|||||||
%post
|
%post
|
||||||
%service_add_post %{name}.service
|
%service_add_post %{name}.service
|
||||||
# reload dbus after install or upgrade to apply new policies
|
# reload dbus after install or upgrade to apply new policies
|
||||||
|
if [ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemctl ]; then
|
||||||
/usr/bin/systemctl reload dbus.service 2>/dev/null || :
|
/usr/bin/systemctl reload dbus.service 2>/dev/null || :
|
||||||
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%service_del_preun %{name}.service
|
%service_del_preun %{name}.service
|
||||||
@ -130,7 +131,8 @@ fi
|
|||||||
%postun
|
%postun
|
||||||
%service_del_postun %{name}.service
|
%service_del_postun %{name}.service
|
||||||
# reload dbus after uninstall, our policies are gone again
|
# reload dbus after uninstall, our policies are gone again
|
||||||
if [ ${FIRST_ARG:-$1} -eq 0 ]; then
|
if [ ${FIRST_ARG:-$1} -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \
|
||||||
|
-a -x /usr/bin/systemctl ]; then
|
||||||
/usr/bin/systemctl reload dbus.service 2>/dev/null || :
|
/usr/bin/systemctl reload dbus.service 2>/dev/null || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -167,7 +169,8 @@ rm -rf contrib/MacOSX-launchd
|
|||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dnsmasq.conf.example contrib dbus
|
%license COPYING COPYING-v3
|
||||||
|
%doc CHANGELOG FAQ doc.html setup.html dnsmasq.conf.example contrib dbus
|
||||||
%config(noreplace) %{_sysconfdir}/dnsmasq.conf
|
%config(noreplace) %{_sysconfdir}/dnsmasq.conf
|
||||||
%{_sbindir}/dnsmasq
|
%{_sbindir}/dnsmasq
|
||||||
%{_sbindir}/rcdnsmasq
|
%{_sbindir}/rcdnsmasq
|
||||||
|
Loading…
Reference in New Issue
Block a user