diff --git a/bind.spec b/bind.spec index 5604d82..bd41a14 100644 --- a/bind.spec +++ b/bind.spec @@ -38,7 +38,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.2 -Release: 9%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 10%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -254,6 +254,10 @@ server and utilities in bind-utils package. Summary: License of the BIND DNS suite Group: Applications/System BuildArch:noarch +%if 0%{?fedora} >= 1 +Obsoletes: bind99-license < 9.9.11-3 +Provides: bind99-license +%endif %description license Contains license of the BIND DNS suite. @@ -394,7 +398,10 @@ This package provides a module which allows commands to be sent to rndc directly Summary: ISC libs for DHCP application Group: System Environment/Libraries Requires: bind-license = %{epoch}:%{version}-%{release} -Conflicts: bind99-license +%if 0%{?fedora} >= 1 +Obsoletes: bind99-libs < 9.9.11-3 +Provides: bind99-libs +%endif %description export-libs Set of ISC libraries for client applications (like ISC DHCP). @@ -403,6 +410,10 @@ Set of ISC libraries for client applications (like ISC DHCP). Summary: Header files and libraries needed for BIND export libraries Group: Development/Libraries Requires: bind-export-libs%{?_isa} = %{epoch}:%{version}-%{release} +%if 0%{?fedora} >= 1 +Obsoletes: bind99-libs-devel < 9.9.11-3 +Provides: bind99-libs-devel +%endif %description export-libs-devel %{summary} @@ -542,9 +553,11 @@ pushd build --enable-full-report \ ; make %{?_smp_mflags} + ### FIXME hack!!! -### make doesn't find properly configured files +### xsltproc doesn't find properly configured files ### and use ones from source tree +### copy generated files to the original location cp -rv doc/* ../doc/ @@ -584,14 +597,21 @@ pushd export-libs --includedir=%{_includedir}/%{_export_dir}/ \ --disable-threads \ --enable-full-report + ## We don't want to build other libs than -export twice ## FIXME this should be in patch instead of SED'ing -## but do we really like/want to patch generated files? -sed '/^SUBDIRS =/s/.*/SUBDIRS = make lib/i' -i Makefile -sed "/^SUBDIRS =/s/.*/SUBDIRS = %{bind_export_libs}/i" -i lib/Makefile +## but do we really like/want to patch generated files? + +sed -i -e \ +'/^SUBDIRS =/s/.*/SUBDIRS = make lib/i' \ +Makefile + +sed -i -e \ +"/^SUBDIRS =/s/.*/SUBDIRS = %{bind_export_libs}/i" \ +lib/Makefile + for lib in %{bind_export_libs} do - echo "Replacing ${lib} with ${lib}-export" find . -name Makefile -exec sed "s/lib${lib}\./lib${lib}-export\./g" -i {} \; done; make %{?_smp_mflags} @@ -599,8 +619,6 @@ popd ## End of export libs %endif - - %check %if %{PKCS11} # Tests require initialization of pkcs11 token @@ -1289,10 +1307,13 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog -* Fri Jan 19 2018 Pavel Zhukov - 32:9.11.2-9.P1 +* Wed Feb 07 2018 Pavel Zhukov - 32:9.11.2-10.P1 +- Add obsoletes/provides tags for smooth update + +* Wed Feb 07 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 +* Wed Feb 07 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