- 9.5.0-P2 releasebind-9_5_0-35_P2_fc9

- bind95-rh450995.patch was merged
- disable transfer stats on DLZ zones (#454783)

1 files changed, 13 insertions, 7 deletions

diff --git a/bind.spec b/bind.spec
index 64a504e..1679efe 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,7 +2,8 @@
 #               Red Hat BIND package .spec file
 #
 
-%define PATCHVER P1
+%define PATCHVER P2
+%define VERSION %{version}-%{PATCHVER}
 %define _default_patch_fuzz 2
 
 %{?!SDB:        %define SDB         1}
@@ -19,13 +20,13 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	34.1.%{PATCHVER}%{?dist}
+Release: 	35.%{PATCHVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: 		System Environment/Daemons
 #
-Source:		ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}-%{PATCHVER}.tar.gz
+Source:		ftp://ftp.isc.org/isc/bind9/%{VERSION}/bind-%{VERSION}.tar.gz
 Source1: 	named.sysconfig
 Source2: 	named.init
 Source3: 	named.logrotate
@@ -60,8 +61,8 @@ Patch72:	bind-9.5-dlz-64bit.patch
 Patch87:	bind-9.5-parallel-build.patch
 Patch91:	bind-9.5-recv-race.patch
 Patch92:	bind-9.5-edns.patch
-Patch93:	bind95-rh450995.patch
 Patch94:	bind95-rh457175.patch
+Patch95:	bind95-rh454783.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -176,7 +177,7 @@ chroot(2) jail for the named(8) program from the BIND package.
 Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 
 %prep
-%setup -q -n %{name}-%{version}-%{PATCHVER}
+%setup -q -n %{name}-%{VERSION}
 
 # Common patches
 %patch0 -p1 -b .varrun
@@ -184,6 +185,7 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %patch5 -p1 -b .nonexec
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
+%patch95 -p1 -b .rh454783
 %if %{SDB}
 mkdir bin/named-sdb
 cp -r bin/named/* bin/named-sdb
@@ -242,7 +244,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %patch87 -p1 -b .parallel
 %patch91 -p1 -b .recv-race
 %patch92 -p1 -b .edns
-%patch93 -p1 -b .rh450995
 %patch94 -p1 -b .rh457175
 
 # Sparc and s390 arches need to use -fPIE                                                           
@@ -405,7 +406,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.268 2008/07/31 14:56:29 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.269 2008/08/06 09:59:26 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -656,6 +657,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Aug 06 2008 Adam Tkac <atkac redhat com> 32:9.5.0-35.P2
+- 9.5.0-P2 release
+  - bind95-rh450995.patch was merged
+- disable transfer stats on DLZ zones (#454783)
+
 * Thu Jul 31 2008 Adam Tkac <atkac redhat com> 32:9.5.0-34.1.P1
 - IP acls weren't merged correctly (#457175)