Merge branch 'master' into f21

This commit is contained in:
Tomas Hozza 2014-07-18 13:36:08 +02:00
commit 0cc3dc9157
5 changed files with 12 additions and 5 deletions

View File

@ -28,7 +28,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.9.5
Release: 7%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Release: 8%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -929,6 +929,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Fri Jul 18 2014 Tomas Hozza <thozza@redhat.com> 32:9.9.5-8.P1
- Use network-online.target instead of network.target (#1117086)
* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> 32:9.9.5-7.P1
- fix license handling

View File

@ -5,10 +5,11 @@
[Unit]
Description=Berkeley Internet Name Domain (DNS)
Wants=nss-lookup.target
Wants=network-online.target
Requires=named-chroot-setup.service
Before=nss-lookup.target
After=network.target
After=named-chroot-setup.service
After=network-online.target
[Service]
Type=forking

View File

@ -5,10 +5,11 @@
[Unit]
Description=Berkeley Internet Name Domain (DNS)
Wants=nss-lookup.target
Wants=network-online.target
Requires=named-sdb-chroot-setup.service
Before=nss-lookup.target
After=network.target
After=named-sdb-chroot-setup.service
After=network-online.target
[Service]
Type=forking

View File

@ -2,9 +2,10 @@
Description=Berkeley Internet Name Domain (DNS)
Wants=nss-lookup.target
Wants=named-setup-rndc.service
Wants=network-online.target
Before=nss-lookup.target
After=network.target
After=named-setup-rndc.service
After=network-online.target
[Service]
Type=forking

View File

@ -2,9 +2,10 @@
Description=Berkeley Internet Name Domain (DNS)
Wants=nss-lookup.target
Wants=named-setup-rndc.service
Wants=network-online.target
Before=nss-lookup.target
After=network.target
After=named-setup-rndc.service
After=network-online.target
[Service]
Type=forking