[bind] Add "-export" suffix to public libraries.
Adam Tkac
atkac at fedoraproject.org
Wed Oct 20 12:49:09 UTC 2010
commit 7a16468dc548f86e490b06307a2cbbc33a3ab7ac
Author: Adam Tkac <atkac at redhat.com>
Date: Wed Oct 20 14:45:23 2010 +0200
Add "-export" suffix to public libraries.
- move BIND9 internal libs back to %%{_libdir}
- add "-export" suffix to public libraries (-lite subpkg)
Signed-off-by: Adam Tkac <atkac at redhat.com>
bind.spec | 17 +++--
bind97-exportlib.patch | 218 +++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 226 insertions(+), 9 deletions(-)
---
diff --git a/bind.spec b/bind.spec
index 1d3bb9e..3059ef9 100644
--- a/bind.spec
+++ b/bind.spec
@@ -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: 4.%{PATCHVER}%{?dist}
+Release: 5.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -324,7 +324,6 @@ libtoolize -c -f; aclocal -I m4 --force; autoconf -f
--enable-exportlib \
--with-export-libdir=%{_libdir} \
--with-export-includedir=%{_includedir} \
- --libdir=%{_libdir}/bind9 \
--includedir=%{_includedir}/bind9 \
%if %{PKCS11}
--with-pkcs11=%{_libdir}/pkcs11/PKCS11_API.so \
@@ -682,11 +681,12 @@ rm -rf ${RPM_BUILD_ROOT}
%files libs
%defattr(-,root,root,-)
-%{_libdir}/bind9/*so.*
+%{_libdir}/*so.*
+%exclude %{_libdir}/*export.so.*
%files libs-lite
%defattr(-,root,root,-)
-%{_libdir}/*so.*
+%{_libdir}/*export.so.*
%files license
%defattr(-,root,root,-)
@@ -706,7 +706,8 @@ rm -rf ${RPM_BUILD_ROOT}
%if %{DEVEL}
%files devel
%defattr(-,root,root,-)
-%{_libdir}/bind9/*so
+%{_libdir}/*so
+%exclude %{_libdir}/*export.so
%{_includedir}/bind9
%{_mandir}/man1/isc-config.sh.1*
%{_mandir}/man3/lwres*
@@ -715,7 +716,7 @@ rm -rf ${RPM_BUILD_ROOT}
%files lite-devel
%defattr(-,root,root,-)
-%{_libdir}/*so
+%{_libdir}/*export.so
%{_includedir}/dns
%{_includedir}/dst
%{_includedir}/irs
@@ -755,6 +756,10 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Wed Oct 20 2010 Adam Tkac <atkac redhat com> 32:9.7.2-5.P2
+- move BIND9 internal libs back to %%{_libdir}
+- add "-export" suffix to public libraries (-lite subpkg)
+
* Thu Oct 07 2010 Adam Tkac <atkac redhat com> 32:9.7.2-4.P2
- ship -devel subpkg for internal libs, dnsperf needs it
diff --git a/bind97-exportlib.patch b/bind97-exportlib.patch
index 01eb462..77ec152 100644
--- a/bind97-exportlib.patch
+++ b/bind97-exportlib.patch
@@ -1,6 +1,6 @@
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
+--- bind-9.7.2-P2/isc-config.sh.in.exportlib 2007-06-20 01:46:59.000000000 +0200
++++ bind-9.7.2-P2/isc-config.sh.in 2010-10-20 14:05:25.423861548 +0200
@@ -20,6 +20,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -27,9 +27,160 @@ diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
if test x"$liblwres" = x"true" ; then
libs="$libs -llwres"
fi
+diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/export/dns/Makefile.in
+--- bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib 2010-06-10 01:49:43.000000000 +0200
++++ bind-9.7.2-P2/lib/export/dns/Makefile.in 2010-10-20 14:08:58.123772859 +0200
+@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_
+
+ CWARNINGS =
+
+-ISCLIBS = ../isc/libisc. at A@
++ISCLIBS = ../isc/libisc-export. at A@
+
+-ISCDEPLIBS = ../isc/libisc. at A@
++ISCDEPLIBS = ../isc/libisc-export. at A@
+
+ LIBS = @LIBS@
+
+@@ -114,29 +114,29 @@ version. at O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libdns. at SA@: ${OBJS}
++libdns-export. at SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libdns.la: ${OBJS}
++libdns-export.la: ${OBJS}
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+
+-timestamp: libdns. at A@
++timestamp: libdns-export. at A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns. at A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns-export. at A@ \
+ ${DESTDIR}${export_libdir}
+
+ clean distclean::
+- rm -f libdns. at A@ timestamp
++ rm -f libdns-export. at A@ timestamp
+ rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
+ rm -f include/dns/rdatastruct.h
+
+diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/export/irs/Makefile.in
+--- bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib 2009-12-06 00:31:40.000000000 +0100
++++ bind-9.7.2-P2/lib/export/irs/Makefile.in 2010-10-20 14:10:39.893717488 +0200
+@@ -42,9 +42,9 @@ SRCS = context.c \
+ gai_sterror.c getaddrinfo.c getnameinfo.c \
+ resconf.c
+
+-ISCLIBS = ../isc/libisc. at A@
+-DNSLIBS = ../dns/libdns. at A@
+-ISCCFGLIBS = ../isccfg/libisccfg. at A@
++ISCLIBS = ../isc/libisc-export. at A@
++DNSLIBS = ../dns/libdns-export. at A@
++ISCCFGLIBS = ../isccfg/libisccfg-export. at A@
+
+ LIBS = @LIBS@
+
+@@ -61,26 +61,26 @@ version. at O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libirs. at SA@: ${OBJS} version. at O@
++libirs-export. at SA@: ${OBJS} version. at O@
+ ${AR} ${ARFLAGS} $@ ${OBJS} version. at O@
+ ${RANLIB} $@
+
+-libirs.la: ${OBJS} version. at O@
++libirs-export.la: ${OBJS} version. at O@
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} version. at O@ ${LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS}
+
+-timestamp: libirs. at A@
++timestamp: libirs-export. at A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs. at A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs-export. at A@ \
+ ${DESTDIR}${export_libdir}
+
+ clean distclean::
+- rm -f libirs. at A@ libirs.la timestamp
++ rm -f libirs-export. at A@ libirs-export.la timestamp
+diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isccfg/Makefile.in
+--- bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib 2009-12-06 00:31:41.000000000 +0100
++++ bind-9.7.2-P2/lib/export/isccfg/Makefile.in 2010-10-20 14:10:14.593741247 +0200
+@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo
+ CDEFINES =
+ CWARNINGS =
+
+-ISCLIBS = ../isc/libisc. at A@
+-DNSLIBS = ../dns/libdns. at A@
++ISCLIBS = ../isc/libisc-export. at A@
++DNSLIBS = ../dns/libdns-export. at A@
+
+ ISCDEPLIBS = ../../lib/isc/libisc. at A@
+-ISCCFGDEPLIBS = libisccfg. at A@
++ISCCFGDEPLIBS = libisccfg-export. at A@
+
+ LIBS = @LIBS@
+
+@@ -58,26 +58,26 @@ version. at O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libisccfg. at SA@: ${OBJS}
++libisccfg-export. at SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libisccfg.la: ${OBJS}
++libisccfg-export.la: ${OBJS}
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} ${LIBS} ${DNSLIBS} ${ISCLIBS}
+
+-timestamp: libisccfg. at A@
++timestamp: libisccfg-export. at A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg. at A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg-export. at A@ \
+ ${DESTDIR}${export_libdir}
+
+ clean distclean::
+- rm -f libisccfg. at A@ timestamp
++ rm -f libisccfg-export. at A@ timestamp
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-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
++++ bind-9.7.2-P2/lib/export/isc/Makefile.in 2010-10-20 14:05:25.433861543 +0200
@@ -101,6 +101,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
LIBS = @LIBS@
@@ -41,3 +192,64 @@ diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
SUBDIRS = include unix nls @ISC_THREAD_DIR@
TARGETS = timestamp
+@@ -114,26 +118,26 @@ version. at O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libisc. at SA@: ${OBJS}
++libisc-export. at SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libisc.la: ${OBJS}
++libisc-export.la: ${OBJS}
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} ${LIBS}
+
+-timestamp: libisc. at A@
++timestamp: libisc-export. at A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc. at A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc-export. at A@ \
+ ${DESTDIR}${export_libdir}
+
+ clean distclean::
+- rm -f libisc. at A@ libisc.la timestamp
++ rm -f libisc-export. at A@ libisc-export.la timestamp
+diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/lib/export/samples/Makefile.in
+--- bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib 2009-12-06 00:31:41.000000000 +0100
++++ bind-9.7.2-P2/lib/export/samples/Makefile.in 2010-10-20 14:05:25.433861543 +0200
+@@ -30,15 +30,15 @@ CINCLUDES = -I${srcdir}/include -I../dns
+ CDEFINES =
+ CWARNINGS =
+
+-DNSLIBS = ../dns/libdns. at A@ @DNS_CRYPTO_LIBS@
+-ISCLIBS = ../isc/libisc. at A@
+-ISCCFGLIBS = ../isccfg/libisccfg. at A@
+-IRSLIBS = ../irs/libirs. at A@
+-
+-DNSDEPLIBS = ../dns/libdns. at A@
+-ISCDEPLIBS = ../isc/libisc. at A@
+-ISCCFGDEPLIBS = ../isccfg/libisccfg. at A@
+-IRSDEPLIBS = ../irs/libirs. at A@
++DNSLIBS = ../dns/libdns-export. at A@ @DNS_CRYPTO_LIBS@
++ISCLIBS = ../isc/libisc-export. at A@
++ISCCFGLIBS = ../isccfg/libisccfg-export. at A@
++IRSLIBS = ../irs/libirs-export. at A@
++
++DNSDEPLIBS = ../dns/libdns-export. at A@
++ISCDEPLIBS = ../isc/libisc-export. at A@
++ISCCFGDEPLIBS = ../isccfg/libisccfg-export. at A@
++IRSDEPLIBS = ../irs/libirs-export. at A@
+
+ DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
+
More information about the scm-commits
mailing list