rpms/bind/devel .cvsignore, 1.27, 1.28 bind.spec, 1.187, 1.188 named.init, 1.53, 1.54 sources, 1.34, 1.35 named.conf, 1.1, NONE named.localhost, 1.1, NONE named.loopback, 1.1, NONE named.rfc1912.zones, 1.4, NONE named.rfc1912.zones.sample, 1.1, NONE named.root, 1.1, NONE named.root.hints, 1.1, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31217

Modified Files:
	.cvsignore bind.spec named.init sources 
Removed Files:
	named.conf named.localhost named.loopback named.rfc1912.zones 
	named.rfc1912.zones.sample named.root named.root.hints 
Log Message:
- marked caching-nameserver as obsolete (#244604)
- fixed typo in initscript (causes that named doesn't detect NetworkManager
  correctly)
- next cleanup in configuration - moved configfiles into config.tar
- removed delay between start & restart in initscript



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Jun 2007 13:44:35 -0000	1.27
+++ .cvsignore	18 Jun 2007 12:40:28 -0000	1.28
@@ -1,3 +1,4 @@
 bind-9.4.1.tar.gz
 bind-chroot.tar.bz2
 libbind-man.tar.gz
+config.tar


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- bind.spec	14 Jun 2007 15:13:02 -0000	1.187
+++ bind.spec	18 Jun 2007 12:40:28 -0000	1.188
@@ -16,7 +16,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,18 +37,11 @@
 Source12: 	README.sdb_pgsql
 Source13: 	namedSetForwarders
 Source14: 	namedGetForwarders
-Source16: 	named.conf
-Source17: 	named.root
-Source18: 	named.localhost
-Source19:	named.loopback
-Source20: 	named.empty
 Source21:	Copyright.caching-nameserver
 Source22: 	bind-chroot-admin.in
-Source23:       named.rfc1912.zones
 Source24:	libbind.pc
 Source25:	named.conf.sample
-Source26:       named.rfc1912.zones.sample
-Source27:       named.root.hints
+Source28:	config.tar
 
 # Common patches
 Patch0:  	bind-9.2.0rc3-varrun.patch
@@ -93,6 +86,8 @@
 Requires(preun):chkconfig >= 1.3.26
 Obsoletes: bind-config
 Provides:  bind-config
+Obsoletes: caching-nameserver
+Provides:  caching-nameserver
 %if %{selinux}
 Requires(post):	policycoreutils
 %endif
@@ -409,13 +404,7 @@
 # Ghost config files:
 touch ${RPM_BUILD_ROOT}/etc/named.conf
 # configuration files:
-mkdir -p ${RPM_BUILD_ROOT}/{etc,var/named}
-install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/etc/named.conf
-install -m 644 %{SOURCE23} ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones
-install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}/var/named/named.ca
-install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}/var/named/named.localhost
-install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}/var/named/named.loopback
-install -m 644 %{SOURCE20} ${RPM_BUILD_ROOT}/var/named/named.empty
+tar -C ${RPM_BUILD_ROOT} -xf %{SOURCE28}
 for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.empty}; do
     touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f;
 done
@@ -427,9 +416,8 @@
 # sample bind configuration files for %doc:
 mkdir -p sample/etc sample/var/named/{data,slaves}
 cp -fp %{SOURCE25} sample/etc/named.conf
-cp -fp %{SOURCE26} sample/etc/named.rfc1912.zones
-cp -fp %{SOURCE27} sample/etc/
-cp -fp %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} sample/var/named
+cp -fp ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones sample/etc/named.rfc1912.zones
+cp -fp ${RPM_BUILD_ROOT}/var/named/{named.ca,named.localhost,named.loopback,named.empty}  sample/var/named
 for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do 
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
@@ -722,6 +710,13 @@
 %endif
 
 %changelog
+* Mon Jun 13 2007 Adam Tkac <atkac redhat com> 31:9.4.1-7.fc8
+- marked caching-nameserver as obsolete (#244604)
+- fixed typo in initscript (causes that named doesn't detect NetworkManager
+  correctly)
+- next cleanup in configuration - moved configfiles into config.tar
+- removed delay between start & stop in restart function in named.init
+
 * Tue Jun 12 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.fc8
 - major changes in initscript. Could be LSB compatible now
 - removed caching-nameserver subpackage. Move configs from this


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- named.init	14 Jun 2007 15:13:02 -0000	1.53
+++ named.init	18 Jun 2007 12:40:28 -0000	1.54
@@ -53,7 +53,7 @@
       dbusEnabled=1;
     fi;
   done
-  [ -z $NetworkManagerEnabled ] || OPTIONS="$OPTIONS -D";
+  [ -z $dbusEnabled ] || OPTIONS="$OPTIONS -D";
 fi;
 
 # Check if all what named needs running
@@ -212,7 +212,6 @@
 }	
 restart() {
 	stop
-	sleep 2
 	start
 }	
 reload() {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Jun 2007 13:44:35 -0000	1.34
+++ sources	18 Jun 2007 12:40:28 -0000	1.35
@@ -1,3 +1,4 @@
 09b54d35036cb0423b2e618f21766285  bind-9.4.1.tar.gz
 dd2b4f4b795a0a989b0a01f93db3a57b  bind-chroot.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
+ba44f6cbd6d54dcb4d357a44276ba294  config.tar


--- named.conf DELETED ---


--- named.localhost DELETED ---


--- named.loopback DELETED ---


--- named.rfc1912.zones DELETED ---


--- named.rfc1912.zones.sample DELETED ---


--- named.root DELETED ---


--- named.root.hints DELETED ---