- up to 9.9.0; 9.8 on BIND_9_8 branch

Changed files:
    bind-link.patch -> 1.8
    bind.spec -> 1.335

diff --git a/bind-link.patch b/bind-link.patch
index 3f2fc5afcdaa53e670b56016d011b7015db5e1d2..558402d18003648af1e14c49db0c7e110c6688c5 100644 (file)
--- a/bind-link.patch
+++ b/bind-link.patch
@@ -61,20 +61,15 @@ diff -Nur bind-9.3.2.orig/lib/lwres/Makefile.in bind-9.3.2.link/lib/lwres/Makefi
  
  SUBDIRS =     include man unix
  TARGETS =     timestamp
---- bind-9.8.1/contrib/dlz/drivers/sdlz_helper.c~      2010-05-14 08:29:37.000000000 +0200
-+++ bind-9.8.1/contrib/dlz/drivers/sdlz_helper.c       2011-09-12 17:59:23.245356577 +0200
-@@ -50,8 +50,6 @@
-  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--#ifdef DLZ
--
- #include <config.h>
- 
- #include <dns/log.h>
-@@ -527,5 +525,3 @@
- 
-       return isc_mem_strdup(mctx, value);
- }
--
--#endif
+
+--- bind-9.9.0/bin/tests/system/dlzexternal/Makefile.in~       2011-11-16 01:42:07.000000000 +0100
++++ bind-9.9.0/bin/tests/system/dlzexternal/Makefile.in        2012-02-29 19:25:59.507505391 +0100
+@@ -49,7 +49,7 @@
+               -o $@ ${DLOPENOBJS} ${LIBS}
+ 
+ driver.@SO@: ${SO_OBJS}
+-      ${LIBTOOL_MODE_LINK} @SO_LD@ -o $@ driver.@O@
++      @SO_LD@ -o $@ .libs/driver.o
+ 
+ clean distclean::
+       rm -f ${TARGETS}

diff --git a/bind.spec b/bind.spec
index cb66f8a9d12b73587a3a37d04d258ba7b9c61f2f..945360589ff492dff022cfc7abb157ed9dd561f6 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -21,8 +21,8 @@
 %bcond_without epoll           # disable epoll support
 %endif
 
-%define                ver     9.8.1
-%if 1
+%define                ver     9.9.0
+%if 0
 %define                pverdot .P1
 %define                pverdir -P1
 %else
@@ -41,12 +41,12 @@ Summary(uk.UTF-8):  BIND - cервер системи доменних імен (
 Summary(zh_CN.UTF-8):  Internet 域名服务器
 Name:          bind
 Version:       %{ver}%{pverdot}
-Release:       5
+Release:       1
 Epoch:         7
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.gz
-# Source0-md5: afa41f8203d50bedad65071f9b6f96d7
+# Source0-md5: 9281d0b04f711d28153ba1ab04a54026
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -446,7 +446,6 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*.*
 # we don't want Makefiles in documentation...
 rm -rf _doc
 cp -a doc _doc
-rm -f _doc/rfc/rfc*
 rm -f _doc/misc/Makefile*
 
 %clean
@@ -499,7 +498,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README EXAMPLE-CONFIG-* FAQ %{?with_hip:bind-hip/COPYRIGHT-HIP-RR}
-%doc _doc/misc/* _doc/arm/*.html _doc/rfc/index %{?with_ldap:_doc/*.sdb-ldap}
+%doc _doc/misc/* _doc/arm/*.html %{?with_ldap:_doc/*.sdb-ldap}
 
 %attr(754,root,root) /etc/rc.d/init.d/named
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/named