Ship -devel subpkg for internal libs, dnsperf needs it.

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2010-10-07 16:20:51 +02:00
parent 5856f09a63
commit 9b81ef32b1
2 changed files with 36 additions and 4 deletions

View File

@ -14,7 +14,7 @@
%{?!bind_gid: %define bind_gid 25} %{?!bind_gid: %define bind_gid 25}
%{?!GSSTSIG: %define GSSTSIG 1} %{?!GSSTSIG: %define GSSTSIG 1}
%{?!PKCS11: %define PKCS11 1} %{?!PKCS11: %define PKCS11 1}
%{?!DEVEL: %define DEVEL 0} %{?!DEVEL: %define DEVEL 1}
%define bind_dir /var/named %define bind_dir /var/named
%define chroot_prefix %{bind_dir}/chroot %define chroot_prefix %{bind_dir}/chroot
# #
@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: ISC License: ISC
Version: 9.7.2 Version: 9.7.2
Release: 3.%{PATCHVER}%{?dist} Release: 4.%{PATCHVER}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -755,6 +755,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif %endif
%changelog %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 * 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 - new bind-libs-lite and bind-lite-devel subpkgs which contain
public version of BIND 9 libraries public version of BIND 9 libraries

View File

@ -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 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.exportlib 2010-06-10 01:49:43.000000000 +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 2010-10-07 15:48:59.231983035 +0200
@@ -101,6 +101,10 @@ SRCS = @ISC_EXTRA_SRCS@ \ @@ -101,6 +101,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
LIBS = @LIBS@ LIBS = @LIBS@