rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

- Use versioned provides

Browse Source 
- Use spaces instead of tabs and minor cleanup
This commit is contained in:
Petr Menšík 2018-02-12 13:11:01 +01:00
parent 3931fea548
commit 128dd7c787
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bind.spec
View File

@ -11,7 +11,6 @@
## The order of libs is important. See lib/Makefile.in for details ## The order of libs is important. See lib/Makefile.in for details
%define bind_export_libs isc dns isccfg irs %define bind_export_libs isc dns isccfg irs
%{!?_export_dir:%global _export_dir /bind9-export/} %{!?_export_dir:%global _export_dir /bind9-export/}
%{!?_export_includedir:%global _export_includedir %{_includedir}/bind9-export}
%{?!SDB: %global SDB 1} %{?!SDB: %global SDB 1}
%{?!unittest: %global unittest 1} %{?!unittest: %global unittest 1}
@ -263,7 +262,7 @@ Group: Applications/System
BuildArch:noarch BuildArch:noarch
%if 0%{?fedora} >= 1 %if 0%{?fedora} >= 1
Obsoletes: bind99-license < 9.9.11-3 Obsoletes: bind99-license < 9.9.11-3
Provides: bind99-license Provides: bind99-license = 9.9.11-3
%endif %endif
%description license %description license
@ -407,7 +406,7 @@ Group: System Environment/Libraries
Requires: bind-license = %{epoch}:%{version}-%{release} Requires: bind-license = %{epoch}:%{version}-%{release}
%if 0%{?fedora} >= 1 %if 0%{?fedora} >= 1
Obsoletes: bind99-libs < 9.9.11-3 Obsoletes: bind99-libs < 9.9.11-3
Provides: bind99-libs Provides: bind99-libs = 9.9.11-3
%endif %endif
%description export-libs %description export-libs
@ -421,7 +420,7 @@ Group: Development/Libraries
Requires: %{name}-export-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-export-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if 0%{?fedora} >= 1 %if 0%{?fedora} >= 1
Obsoletes: bind99-libs-devel < 9.9.11-3 Obsoletes: bind99-libs-devel < 9.9.11-3
Provides: bind99-libs-devel Provides: bind99-libs-devel = 9.9.11-3
%endif %endif
%description export-devel %description export-devel
@ -784,8 +783,6 @@ popd
%if %{with_export_libs} %if %{with_export_libs}
pushd export-libs pushd export-libs
## -lirs-export -ldns-export -lisccfg-export -lisc-export
## install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-export/
make DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=${RPM_BUILD_ROOT} install
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
@ -1405,6 +1402,7 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Wed Feb 07 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-11.P1 * Wed Feb 07 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-11.P1
- Use versioned provides
- Fix starting of unit tests - Fix starting of unit tests
- Forward export libs path to isc-config - Forward export libs path to isc-config
- Rename export devel subpackage to bind-export-devel - Rename export devel subpackage to bind-export-devel