summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bind.spec7
-rw-r--r--bind97-exportlib.patch33
2 files changed, 36 insertions, 4 deletions
diff --git a/bind.spec b/bind.spec
index 147527e..1d3bb9e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -14,7 +14,7 @@
%{?!bind_gid: %define bind_gid 25}
%{?!GSSTSIG: %define GSSTSIG 1}
%{?!PKCS11: %define PKCS11 1}
-%{?!DEVEL: %define DEVEL 0}
+%{?!DEVEL: %define DEVEL 1}
%define bind_dir /var/named
%define chroot_prefix %{bind_dir}/chroot
#
@@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.7.2
-Release: 3.%{PATCHVER}%{?dist}
+Release: 4.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -755,6 +755,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Thu Oct 07 2010 Adam Tkac <atkac redhat com> 32:9.7.2-4.P2
+- ship -devel subpkg for internal libs, dnsperf needs it
+
* Thu Oct 07 2010 Adam Tkac <atkac redhat com> 32:9.7.2-3.P2
- new bind-libs-lite and bind-lite-devel subpkgs which contain
public version of BIND 9 libraries
diff --git a/bind97-exportlib.patch b/bind97-exportlib.patch
index 70f7c72..01eb462 100644
--- a/bind97-exportlib.patch
+++ b/bind97-exportlib.patch
@@ -1,6 +1,35 @@
+diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
+--- bind-9.7.2-P2/isc-config.sh.in.exportlib 2010-10-07 16:02:23.111647823 +0200
++++ bind-9.7.2-P2/isc-config.sh.in 2010-10-07 16:04:24.211597326 +0200
+@@ -20,6 +20,8 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=
++libdir=@libdir@
++includedir=@includedir@
+
+ usage()
+ {
+@@ -115,14 +117,14 @@ if test x"$echo_exec_prefix" = x"true" ;
+ echo $exec_prefix
+ fi
+ if test x"$echo_cflags" = x"true"; then
+- includes="-I${exec_prefix}/include"
++ includes="-I${includedir}"
+ if test x"$libisc" = x"true"; then
+ includes="$includes @ALWAYS_DEFINES@ @STD_CINCLUDES@ @STD_CDEFINES@ @CCOPT@"
+ fi
+ echo $includes
+ fi
+ if test x"$echo_libs" = x"true"; then
+- libs=-L${exec_prefix}/lib
++ libs="-L${libdir}"
+ if test x"$liblwres" = x"true" ; then
+ libs="$libs -llwres"
+ fi
diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isc/Makefile.in
---- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib 2010-10-07 14:42:09.563655036 +0200
-+++ bind-9.7.2-P2/lib/export/isc/Makefile.in 2010-10-07 14:42:16.923651967 +0200
+--- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib 2010-06-10 01:49:43.000000000 +0200
++++ bind-9.7.2-P2/lib/export/isc/Makefile.in 2010-10-07 15:48:59.231983035 +0200
@@ -101,6 +101,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
LIBS = @LIBS@