From 8af0fe42da949da636ee0b244ad8fe81a3fcc26f Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Fri, 26 Oct 2007 10:33:01 +0000
Subject: [PATCH] - minor cleanup in bind-chroot-admin

---
 bind-chroot-admin.in | 4 +---
 bind.spec            | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in
index 8138269..66e71ce 100644
--- a/bind-chroot-admin.in
+++ b/bind-chroot-admin.in
@@ -230,7 +230,7 @@ function sync_files()
 	done
 	pfx=${BIND_CHROOT_PREFIX}
     else              # chroot is disabled	
-	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 |
+	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/{named{/*,/data/*,/slaves/*,/dynamic/*},log/named.log}} -maxdepth 0 |
 	while read f; 
 	do
 	    if [ ! -d "$f" ]; then
@@ -238,8 +238,6 @@ function sync_files()
 		[ ! -e $changed ] && touch $changed;
 	    fi;
 	done
-	[ -L /var/log/named.log ] && rm -f /var/log/named.log
-	[ -e ${BIND_CHROOT_PREFIX}/var/log/named.log ] && mv -f ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log
     fi;
     if [ ! -e ${pfx}/etc/rndc.key ]; then
 	   echo 'key "rndckey" {
diff --git a/bind.spec b/bind.spec
index eba6947..8f3b4cd 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	16.1.%{RELEASEVER}%{?dist}
+Release: 	16.2.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -651,6 +651,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Fri Oct 26 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.2.a6
+- minor cleanup in bind-chroot-admin
+
 * Wed Oct 25 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.1.a6
 - fixed typo in initscript