- fire away libbind, it is now separate packagebind-9_6_0-8_P1_fc11

6 files changed, 6 insertions, 87 deletions

diff --git a/.cvsignore b/.cvsignore
index bc4d89d..5e9f39e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,3 @@
 config-4.tar.bz2
-libbind-man.tar.gz
 bind-chroot.tar.bz2
 bind-9.6.0-P1.tar.gz
-libbind-9.5.1b2.tar.bz2
diff --git a/bind-96-libtool2-libbind.patch b/bind-96-libtool2-libbind.patch
deleted file mode 100644
index 1a92893..0000000
--- a/bind-96-libtool2-libbind.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bind-9.6.0b1/lib/bind/configure.in.libtool2-libbind bind-9.6.0b1/lib/bind/configure.in
---- bind-9.6.0b1/lib/bind/configure.in.libtool2-libbind	2008-11-24 13:11:18.000000000 +0100
-+++ bind-9.6.0b1/lib/bind/configure.in	2008-11-24 13:11:41.000000000 +0100
-@@ -20,6 +20,8 @@ AC_PREREQ(2.13)
- 
- AC_CONFIG_HEADER(config.h)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- AC_CANONICAL_HOST
- 
- AC_PROG_MAKE_SET
diff --git a/bind-96-temporary-libbind.patch b/bind-96-temporary-libbind.patch
deleted file mode 100644
index c60bc5e..0000000
--- a/bind-96-temporary-libbind.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bind-9.6.0b1/configure.in.libbind bind-9.6.0b1/configure.in
---- bind-9.6.0b1/configure.in.libbind	2008-11-10 15:43:33.000000000 +0100
-+++ bind-9.6.0b1/configure.in	2008-11-10 15:43:51.000000000 +0100
-@@ -23,6 +23,8 @@ AC_REVISION($Revision: 1.456 $)
- AC_INIT(lib/dns/name.c)
- AC_PREREQ(2.59)
- 
-+AC_CONFIG_SUBDIRS(lib/bind)
-+
- AC_CONFIG_HEADER(config.h)
- 
- AC_CANONICAL_HOST
diff --git a/bind-nonexec.patch b/bind-nonexec.patch
index 6501ef1..9e65912 100644
--- a/bind-nonexec.patch
+++ b/bind-nonexec.patch
@@ -1,14 +1,3 @@
---- bind-9.2.4rc6/lib/bind/Makefile.in.nonexec	2004-03-09 04:17:23.000000000 -0500
-+++ bind-9.2.4rc6/lib/bind/Makefile.in	2004-07-16 19:23:30.000000000 -0400
-@@ -111,7 +111,7 @@
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f libbind.@SA@ libbind.la
 --- bind-9.2.4rc6/lib/dns/Makefile.in.nonexec	2004-04-14 20:35:27.000000000 -0400
 +++ bind-9.2.4rc6/lib/dns/Makefile.in	2004-07-16 19:25:40.000000000 -0400
 @@ -136,7 +136,7 @@
diff --git a/bind.spec b/bind.spec
index 90753ae..286b4fd 100644
--- a/bind.spec
+++ b/bind.spec
@@ -9,7 +9,6 @@
 %define VERSION %{version}-%{PATCHVER}
 
 %{?!SDB:       %define SDB       1}
-%{?!LIBBIND:   %define LIBBIND   1}
 %{?!test:      %define test      0}
 %{?!bind_uid:  %define bind_uid  25}
 %{?!bind_gid:  %define bind_gid  25}
@@ -21,7 +20,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  7.%{PATCHVER}%{?dist}
+Release:  8.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,7 +34,6 @@ Source5:  rfc1912.txt
 Source6:  bind-chroot.tar.bz2
 Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
 Source8:  dnszone.schema
-Source9:  libbind-man.tar.gz
 Source12: README.sdb_pgsql
 Source21: Copyright.caching-nameserver
 Source24: libbind.pc
@@ -43,12 +41,6 @@ Source25: named.conf.sample
 Source28: config-4.tar.bz2
 Source30: ldap2zone.c
 
-%if %{LIBBIND}
-# XXX libbind is going to be a separate product in 9.6 series but it wasn't
-# released yet. Use libbind from 9.5 series
-Source31: libbind-9.5.1b2.tar.bz2
-%endif
-
 # Common patches
 Patch1:  bind-9.3.3rc2-rndckey.patch
 Patch5:  bind-nonexec.patch
@@ -59,10 +51,6 @@ Patch71: bind-9.5-overflow.patch
 Patch72: bind-9.5-dlz-64bit.patch
 Patch87: bind-9.5-parallel-build.patch
 Patch96: bind-95-rh469440.patch
-%if %{LIBBIND}
-Patch97: bind-96-temporary-libbind.patch
-Patch100:bind-96-libtool2-libbind.patch
-%endif
 Patch99: bind-96-libtool2.patch
 Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
@@ -177,14 +165,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %prep
 %setup -q -n %{name}-%{VERSION}
 
-%if %{LIBBIND}
-# XXX temporary libbind workaround
-pushd lib
-tar xjf %{SOURCE31}
-popd
-sed -i 's/SUBDIRS\(.*\)/SUBDIRS\1 lib\/bind/' Makefile.in
-%endif
-
 # Common patches
 %patch1 -p1 -b .key
 %patch5 -p1 -b .nonexec
@@ -217,10 +197,6 @@ cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
 cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %patch12 -p1 -b .sdb
 %endif
-%if %{LIBBIND}
-%patch13 -p1 -b .fix_libbind_includedir
-%patch97 -p1 -b .temporary-libbind
-%endif
 %if %{SDB}
 %patch17 -p1 -b .fix_sdb_ldap
 %endif
@@ -241,10 +217,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 # XXX due new libtool. Not sure about proper upstream approach yet.
 mkdir m4
 %patch99 -p1 -b .libtool2
-%if %{LIBBIND}
-mkdir lib/bind/m4
-%patch100 -p1 -b .libtool2-libbind
-%endif
 
 %patch102 -p1 -b .rh452060
 %patch103 -p0 -b .realloc
@@ -267,11 +239,6 @@ sed -i -e \
 's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \
 version
 
-%if %{LIBBIND}
-pushd lib/bind
-libtoolize -c -f; aclocal -I m4 --force; autoconf -f
-popd
-%endif
 libtoolize -c -f; aclocal -I m4 --force; autoheader -f; autoconf -f
 
 %configure \
@@ -360,11 +327,6 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/openldap/schema
 install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/openldap/schema/dnszone.schema
 install -m 644 %{SOURCE12} contrib/sdb/pgsql/
 %endif
-%if %{LIBBIND}
-gunzip < %{SOURCE9} | (cd ${RPM_BUILD_ROOT}/usr/share; tar -xpf -)
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig
-install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libbind.pc
-%endif
 
 # Files required to run test-suite outside of build tree:
 cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9
@@ -575,13 +537,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/lwres
 %{_mandir}/man3/lwres*
 %{_bindir}/isc-config.sh
-%if %{LIBBIND}
-%{_libdir}/pkgconfig/libbind.pc
-%{_includedir}/bind
-%{_mandir}/man3/libbind-*
-%{_mandir}/man7/libbind-*
-%{_mandir}/man5/libbind-*
-%endif
 
 %files chroot
 
@@ -606,10 +561,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
-* Wed Mar 04 2009 Adam Tkac <atkac redhat com> - 32:9.6.0-7.P1
+* Mon Mar 09 2009 Adam Tkac <atkac redhat com> 32:9.6.0-8.P1
+- fire away libbind, it is now separate package
+
+* Wed Mar 04 2009 Adam Tkac <atkac redhat com> 32:9.6.0-7.P1
 - fixed some read buffer overflows (upstream)
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 32:9.6.0-6.P1
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> 32:9.6.0-6.P1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Feb 12 2009 Martin Nagy <mnagy redhat com> 32:9.6.0-5.P1
diff --git a/sources b/sources
index 3124586..877d3cc 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
-13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 886b7eae55cfdc8cd8d2ca74a2f99c6e  bind-9.6.0-P1.tar.gz
-3d1dad3630ec3510c8ab0ac2217a3317  libbind-9.5.1b2.tar.bz2