remove missing unbound-rootkey.service from post/preun/postun sections

Also remove initscript from repo, since it is not needed any more.

Signed-off-by: Tomas Hozza <thozza@redhat.com>

unbound.init

@@ -1,133 +0,0 @@
-#!/bin/sh
-#
-# unbound	This shell script takes care of starting and stopping
-#		unbound (DNS server).
-#
-# chkconfig:   - 21 86
-# description:	unbound is a Domain Name Server (DNS) \
-#		that is used to resolve host names to IP addresses.
-
-### BEGIN INIT INFO
-# Provides: unbound
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Should-Start: $syslog
-# Should-Stop: $syslog
-# Short-Description: unbound recursive Domain Name Server.
-# Description:  unbound is a Domain Name Server (DNS) 
-#		that is used to resolve host names to IP addresses.
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec="/usr/sbin/unbound"
-config="/etc/unbound/unbound.conf"
-rootdir="/var/lib/unbound"
-pidfile="/var/run/unbound/unbound.pid"
-piddir=`dirname $pidfile`
-
-[ -e /etc/sysconfig/unbound ] && . /etc/sysconfig/unbound
-[ -e /etc/sysconfig/dnssec ] && . /etc/sysconfig/dnssec
-
-lockfile=/var/lock/subsys/unbound
-
-[ -x /usr/sbin/dnssec-configure ] && [ -r "$config" ] &&
-  [ /etc/sysconfig/dnssec -nt "$config" ] && \
-    /usr/sbin/dnssec-configure -u --norestart --dnssec="$DNSSEC" --dlv="$DLV"
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    # /var/run could (and should) be tmpfs
-    [ -d $piddir ] || mkdir $piddir
-
-    if [ ! -f /etc/unbound/unbound_control.key ]
-    then
-	echo -n $"Generating unbound control key and certificate: "
-	/usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
-	chgrp unbound /etc/unbound/unbound_*key /etc/unbound/unbound_*pem
-	[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
-	    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
-	echo
-    else
-	# old init script created these as root instead of unbound.
-	if [ -G /etc/unbound/unbound_control.key ]
-	then
-	    chgrp unbound /etc/unbound/unbound_*key /etc/unbound/unbound_*pem
-	    [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
-		[ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
-	    echo
-	fi
-    fi
-
-    echo -n $"Starting unbound: "
-
-    # if not running, start it up here
-    daemon --pidfile=$pidfile $exec
-    retval=$?
-    [ $retval -eq 0 ] && touch $lockfile
-    echo
-}
-
-stop() {
-    echo -n $"Stopping unbound: "
-    # stop it here, often "killproc unbound"
-    killproc -p $pidfile unbound
-    retval=$?
-    [ $retval -eq 0 ] && rm -f $lockfile
-    echo
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    kill -HUP `cat $pidfile`
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status -p $pidfile unbound
-}
-
-rh_status_q() {
-    rh_status -p $pidfile >/dev/null 2>&1
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        restart
-        ;;
-    reload)
-        reload
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?

unbound.spec

@@ -11,7 +11,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.4.20
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -250,7 +250,6 @@ exit 0
 %post
 %systemd_post unbound.service
 %systemd_post unbound-keygen.service
-%systemd_post unbound-rootkey.service
 
 %post libs 
 /sbin/ldconfig
@@ -259,12 +258,10 @@ exit 0
 %preun
 %systemd_preun unbound.service
 %systemd_preun unbound-keygen.service
-%systemd_preun unbound-rootkey.service
 
 %postun 
 %systemd_postun_with_restart unbound.service
 %systemd_postun unbound-keygen.service
-%systemd_postun unbound-rootkey.service
 
 %postun libs -p /sbin/ldconfig
 
@@ -280,6 +277,9 @@ exit 0
 /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jul 03 2013 Tomas Hozza <thozza@redhat.com> - 1.4.20-14
+- remove missing unbound-rootkey.service from post/preun/postun sections
+
 * Sat Jun 01 2013 Paul Wouters <pwouters@redhat.com> - 1.4.20-13
 - Run unbound-anchor as user unbound in unbound.service