- update to 9.6.2bind-9_6_2-1_fc11

- patches merged
- bind-96-db_unregister.patch
- bind96-rh507469.patch

1 files changed, 10 insertions, 8 deletions

diff --git a/bind.spec b/bind.spec
index 6116cdd..55b2eb3 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,11 +2,11 @@
 # Red Hat BIND package .spec file
 #
 
-%define PATCHVER P3
+#%define PATCHVER P3
 #%define PREVER rc1
 #%define VERSION %{version}
 #%define VERSION %{version}-%{PATCHVER}
-%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}
 
 %{?!SDB:       %define SDB       1}
 %{?!test:      %define test      0}
@@ -19,8 +19,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  ISC
-Version:  9.6.1
-Release:  10.%{PATCHVER}%{?dist}
+Version:  9.6.2
+Release:  1%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +53,6 @@ Patch99: bind-96-libtool2.patch
 Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
-Patch107:bind96-rh507469.patch
 Patch108:bind96-rh549284.patch
 
 # SDB patches
@@ -64,7 +63,6 @@ Patch62: bind-9.5-sdb-sqlite-bld.patch
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 Patch104: bind-96-dyndb.patch
-Patch105: bind-96-db_unregister.patch
 
 # IDN paches
 Patch73: bind-9.5-libidn.patch
@@ -172,7 +170,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
 %patch104 -p1 -b .dyndb
-%patch105 -p1 -b .db_unregister
 %if %{SDB}
 %patch101 -p1 -b .old-api
 mkdir bin/named-sdb
@@ -220,7 +217,6 @@ mkdir m4
 
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
-%patch107 -p1 -b .rh507469
 %patch108 -p1 -b .rh549284
 
 # Sparc and s390 arches need to use -fPIE
@@ -589,6 +585,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Fri Mar 12 2010 Adam Tkac <atkac redhat com> 32:9.6.2-1
+- update to 9.6.2
+- patches merged
+  - bind-96-db_unregister.patch
+  - bind96-rh507469.patch
+
 * Wed Jan 27 2010 Adam Tkac <atkac redhat com> 32:9.6.1-10.P3
 - revert the "DEBUG" feature (#510283), it causes too many problems (#545128)