- patches bind-9.4-2119_revert.patch and libbind-9.3.1rc1-fix_h_errno.patchbind-9_4_2-0_3_b1_fc7

    are obsoleted by bind-9.4-_res_errno.patch

1 files changed, 9 insertions, 6 deletions

diff --git a/bind.spec b/bind.spec
index 779ef68..18bcfc1 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.2.%{RELEASEVER}%{?dist}
+Release: 	0.3.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +56,6 @@ Patch10: 	bind-9.3.2b1-PIE.patch
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
 Patch12: 	bind-9.3.1rc1-sdb.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
-Patch14: 	libbind-9.3.1rc1-fix_h_errno.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch17: 	bind-9.3.2b1-fix_sdb_ldap.patch
 Patch22: 	bind-9.3.1-sdb_dbus.patch
@@ -73,7 +72,7 @@ Patch66:	bind-9.4.0-zone-freeze.patch
 Patch68:	bind-9.4.1-ldap-api.patch
 Patch70:	bind-9.4-update.patch
 Patch71:	bind-9.4-dbus.patch
-Patch72:	bind-9.4-2119_revert.patch
+Patch73:	bind-9.4-_res_errno.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -259,7 +258,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %endif
 %if %{LIBBIND}
 %patch13 -p1 -b .fix_libbind_includedir
-%patch14 -p1 -b .fix_h_errno
 %endif
 %patch16 -p1 -b .redhat_doc
 %if %{WITH_DBUS}
@@ -299,7 +297,7 @@ popd
 %endif
 %patch66 -p1 -b .freeze
 %patch70 -p1 -b .update
-%patch72 -p1 -b .2119_revert
+%patch73 -p1 -b .errno
 :;
 
 
@@ -461,7 +459,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.191 2007/09/03 07:54:59 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.192 2007/09/06 12:04: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:
@@ -785,6 +783,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.b1
+- patches bind-9.4-2119_revert.patch and
+  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
+  bind-9.4-_res_errno.patch
+
 * Fri Aug 31 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.2.b1
 - temporary revert ISC 2119 change which conflicts with our
   "libbind-errno" patch (#254501)