Update to 9.8.0.

- bind97-rh665971.patch merged

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2011-03-03 13:36:09 +01:00
parent 100a9cfcec
commit 8bf97dc309
4 changed files with 10 additions and 31 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ bind-9.7.2b1.tar.gz
/bind-9.7.3rc1.tar.gz
/bind-9.7.3.tar.gz
/bind-9.8.0rc1.tar.gz
/bind-9.8.0.tar.gz

View File

@ -3,10 +3,10 @@
#
#%define PATCHVER P3
%define PREVER rc1
#%define PREVER rc1
#%define VERSION %{version}-%{PATCHVER}
#%define VERSION %{version}
%define VERSION %{version}%{PREVER}
#%define VERSION %{version}%{PREVER}
%define VERSION %{version}
%{?!SDB: %define SDB 1}
%{?!test: %define test 0}
@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.8.0
Release: 0.4.%{PREVER}%{?dist}
Release: 1%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -62,7 +62,6 @@ Patch110:bind97-rh570851.patch
Patch111:bind97-exportlib.patch
Patch112:bind97-rh645544.patch
Patch113:bind97-rh674334.patch
Patch114:bind97-rh665971.patch
Patch115:bind97-cleanup.patch
Patch116:bind98-includes.patch
@ -301,7 +300,6 @@ mkdir m4
%patch111 -p1 -b .exportlib
%patch112 -p1 -b .rh645544
%patch113 -p1 -b .rh674334
%patch114 -p1 -b .rh665971
%patch115 -p1 -b .cleanup
%patch116 -p1 -b .includes
@ -772,6 +770,10 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Thu Mar 03 2011 Adam Tkac <atkac redhat com> 32:9.8.0-1
- update to 9.8.0
- bind97-rh665971.patch merged
* Thu Mar 03 2011 Adam Tkac <atkac redhat com> 32:9.8.0-0.4.rc1
- revert previous change (integration with libnmserver)

View File

@ -1,24 +0,0 @@
diff -up bind-9.7.3/lib/isccc/Makefile.in.rh665971 bind-9.7.3/lib/isccc/Makefile.in
--- bind-9.7.3/lib/isccc/Makefile.in.rh665971 2011-02-18 15:01:28.718993909 +0100
+++ bind-9.7.3/lib/isccc/Makefile.in 2011-02-18 15:01:41.718965257 +0100
@@ -71,7 +71,7 @@ libisccc.la: ${OBJS}
${LIBTOOL_MODE_LINK} \
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccc.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
- ${OBJS} ${LIBS} ${ISCLIBS}
+ ${OBJS} ${ISCLIBS} ${LIBS}
timestamp: libisccc.@A@
touch timestamp
diff -up bind-9.7.3/lib/isccfg/Makefile.in.rh665971 bind-9.7.3/lib/isccfg/Makefile.in
--- bind-9.7.3/lib/isccfg/Makefile.in.rh665971 2011-02-18 15:01:06.809042198 +0100
+++ bind-9.7.3/lib/isccfg/Makefile.in 2011-02-18 15:01:19.549014121 +0100
@@ -68,7 +68,7 @@ libisccfg.la: ${OBJS}
${LIBTOOL_MODE_LINK} \
${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la -rpath ${libdir} \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
- ${OBJS} ${LIBS} ${DNSLIBS} ${ISCCCLIBS} ${ISCLIBS}
+ ${OBJS} ${DNSLIBS} ${ISCCCLIBS} ${ISCLIBS} ${LIBS}
timestamp: libisccfg.@A@
touch timestamp

View File

@ -1,2 +1,2 @@
e802ac97ca419c2ddfc043509bcb17bc bind-9.8.0.tar.gz
76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2
1d9fb97c5c8e89a9e16c81e5fbee102d bind-9.8.0rc1.tar.gz