From 76e1f1a098db16e1084e356a560ee8d39c8d5886 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Feb 14 2018 20:34:55 +0000 Subject: Add export-libs-devel package --- diff --git a/bind.spec b/bind.spec index 62609c2..5604d82 100644 --- a/bind.spec +++ b/bind.spec @@ -10,7 +10,7 @@ %global with_export_libs 1 ## The order of libs is important. See lib/Makefile.in for details %define bind_export_libs isc dns isccfg irs -%{!?_export_libdir:%global _export_libdir %{_libdir}/%{name}-export} +%{!?_export_dir:%global _export_dir /bind9-export/} %{?!SDB: %global SDB 1} %{?!unittest: %global unittest 1} @@ -397,7 +397,14 @@ Requires: bind-license = %{epoch}:%{version}-%{release} Conflicts: bind99-license %description export-libs -## TBD +Set of ISC libraries for client applications (like ISC DHCP). + +%package export-libs-devel +Summary: Header files and libraries needed for BIND export libraries +Group: Development/Libraries +Requires: bind-export-libs%{?_isa} = %{epoch}:%{version}-%{release} + +%description export-libs-devel %{summary} %endif @@ -573,8 +580,8 @@ pushd export-libs --disable-static \ --disable-epoll \ --disable-kqueue \ - --libdir=%{_export_libdir} \ - --includedir=%{_includedir}/removeme/ \ + --libdir=%{_libdir}%{_export_dir} \ + --includedir=%{_includedir}/%{_export_dir}/ \ --disable-threads \ --enable-full-report ## We don't want to build other libs than -export twice @@ -694,13 +701,12 @@ pushd export-libs ## install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-export/ make DESTDIR=${RPM_BUILD_ROOT} install mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_export_libdir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf popd %endif # Remove unwanted files rm -f ${RPM_BUILD_ROOT}/etc/bind.keys -rm -rf ${RPM_BUILD_ROOT}/%{_includedir}/removeme # Systemd unit files @@ -1273,12 +1279,20 @@ rm -rf ${RPM_BUILD_ROOT} %if %{with_export_libs} %files export-libs -%{_export_libdir} +%dir %{_libdir}/%{_export_dir} +%{_libdir}/%{_export_dir}/lib*.so.* %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf + +%files export-libs-devel +%{_includedir}/%{_export_dir} +%{_libdir}/%{_export_dir}/lib*.so %endif %changelog -* Wed Feb 07 2018 Pavel Zhukov - 32:9.11.2-8.P1 +* Fri Jan 19 2018 Pavel Zhukov - 32:9.11.2-9.P1 +- Build devel package for export-libs + +* Thu Jan 18 2018 Pavel Zhukov - 32:9.11.2-8.P1 - Build export libraries with disabled threads and selects * Wed Feb 07 2018 Fedora Release Engineering - 32:9.11.2-7.P1