* Thu Aug 23 2012 Paul Wouters <pwouters@redhat.com> - 1.4.18-2
- Use new systemd-rpm macros (rhbz#850351) - Clean up old obsoleted dnssec-conf from < fedora 15
This commit is contained in:
parent
0d6241b192
commit
8c4f681b8d
40
unbound.spec
40
unbound.spec
@ -14,7 +14,7 @@
|
|||||||
Summary: Validating, recursive, and caching DNS(SEC) resolver
|
Summary: Validating, recursive, and caching DNS(SEC) resolver
|
||||||
Name: unbound
|
Name: unbound
|
||||||
Version: 1.4.18
|
Version: 1.4.18
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
Url: http://www.nlnetlabs.nl/unbound/
|
Url: http://www.nlnetlabs.nl/unbound/
|
||||||
Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
|
Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
|
||||||
@ -33,11 +33,11 @@ BuildRequires: libevent-devel expat-devel
|
|||||||
%if %{with_python}
|
%if %{with_python}
|
||||||
BuildRequires: python-devel swig
|
BuildRequires: python-devel swig
|
||||||
%endif
|
%endif
|
||||||
# Required for SVN versions
|
|
||||||
BuildRequires: bison
|
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
|
# Required for SVN versions
|
||||||
|
# BuildRequires: bison
|
||||||
|
|
||||||
Requires(post): systemd-sysv
|
#Requires(post): systemd-sysv
|
||||||
Requires(post): systemd-units
|
Requires(post): systemd-units
|
||||||
Requires(preun): systemd-units
|
Requires(preun): systemd-units
|
||||||
Requires(postun): systemd-units
|
Requires(postun): systemd-units
|
||||||
@ -202,34 +202,18 @@ useradd -r -g unbound -d %{_sysconfdir}/unbound -s /sbin/nologin \
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%post
|
%post
|
||||||
if [ $1 -eq 1 ] ; then
|
%systemd_post unbound.service
|
||||||
# Initial installation
|
%systemd_post unbound-keygen.service
|
||||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
|
||||||
fi
|
|
||||||
# dnssec-conf used to contain our DLV key, but now we include it via unbound
|
|
||||||
# If unbound had previously been configured with dnssec-configure, we need
|
|
||||||
# to migrate the location of the DLV key file (to keep DLV enabled, and because
|
|
||||||
# unbound won't start with a bad location for a DLV key file.
|
|
||||||
sed -i "s:/etc/pki/dnssec-keys[/]*dlv:/etc/unbound:" %{_sysconfdir}/unbound/unbound.conf
|
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
%post libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ $1 -eq 0 ]; then
|
%systemd_preun unbound.service
|
||||||
# Package removal, not upgrade
|
%systemd_preun unbound-keygen.service
|
||||||
/bin/systemctl --no-reload disable unbound.service > /dev/null 2>&1 || :
|
|
||||||
/bin/systemctl stop unbound.service > /dev/null 2>&1 || :
|
|
||||||
/bin/systemctl --no-reload disable unbound-keygen.service > /dev/null 2>&1 || :
|
|
||||||
/bin/systemctl stop unbound-keygen.service > /dev/null 2>&1 || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
%systemd_postun_with_restart unbound.service
|
||||||
if [ $1 -ge 1 ] ; then
|
%systemd_postun unbound-keygen.service
|
||||||
# Package upgrade, not uninstall
|
|
||||||
/bin/systemctl try-restart unbound.service >/dev/null 2>&1 || :
|
|
||||||
/bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -245,6 +229,10 @@ fi
|
|||||||
/bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
|
/bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 23 2012 Paul Wouters <pwouters@redhat.com> - 1.4.18-2
|
||||||
|
- Use new systemd-rpm macros (rhbz#850351)
|
||||||
|
- Clean up old obsoleted dnssec-conf from < fedora 15
|
||||||
|
|
||||||
* Fri Aug 03 2012 Paul Wouters <pwouters@redhat.com> - 1.4.18-1
|
* Fri Aug 03 2012 Paul Wouters <pwouters@redhat.com> - 1.4.18-1
|
||||||
- Updated to 1.4.18 (FIPS related fixes mostly)
|
- Updated to 1.4.18 (FIPS related fixes mostly)
|
||||||
- Removed patches that were merged in upstream
|
- Removed patches that were merged in upstream
|
||||||
|
Loading…
Reference in New Issue
Block a user