Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/ldns.git#7a65ca8b2dc4e3f966de15fe5a1dcf4b75f7ead7
This commit is contained in:
DistroBaker 2021-01-04 16:20:38 +00:00
parent 8ede826194
commit 534234a65d

View File

@ -39,7 +39,7 @@
Summary: Low-level DNS(SEC) library with API
Name: ldns
Version: 1.7.1
Release: 1%{?dist}
Release: 2%{?dist}
License: BSD
Url: https://www.nlnetlabs.nl/%{name}/
@ -231,15 +231,15 @@ pushd %{pkgname}
--with-pyldns PYTHON=%{__python3}
%endif
make %{?_smp_mflags}
make %{?_smp_mflags} doc
%make_build
%make_build doc
# We cannot use the built-in --with-p5-dns-ldns
%if %{with perl}
pushd contrib/DNS-LDNS
LD_LIBRARY_PATH="../../lib:$LD_LIBRARY_PATH" perl \
Makefile.PL INSTALLDIRS=vendor INC="-I. -I../.." LIBS="-L../../lib"
make
%make_build -j1
popd
%endif
@ -253,7 +253,7 @@ popd
%{common_args} \
--with-pyldns PYTHON=%{__python2}
make %{?_smp_mflags}
%make_build
popd
%endif
@ -268,8 +268,9 @@ pushd %{pkgname}_python3
pushd %{pkgname}
%endif
make DESTDIR=%{buildroot} INSTALL="%{__install} -pD" install
make DESTDIR=%{buildroot} INSTALL="%{__install} -pD" install-doc
mkdir -p %{buildroot}%{_libdir}/pkgconfig
%make_install install
%make_install install-doc
# remove .la files
rm -rf %{buildroot}%{_libdir}/*.la
@ -278,15 +279,16 @@ rm -rf %{buildroot}%{python3_sitearch}/*.la
%endif
%if %{with perl}
make -C contrib/DNS-LDNS DESTDIR=%{buildroot} pure_install
%make_install -j1 -C contrib/DNS-LDNS pure_install
chmod 755 %{buildroot}%{perl_vendorarch}/auto/DNS/LDNS/LDNS.so
rm -f %{buildroot}%{perl_vendorarch}/auto/DNS/LDNS/{.packlist,LDNS.bs}
rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%endif
popd
%if %{with python2}
pushd %{pkgname}_python2
make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-pyldns install-pyldnsx
%make_install install-pyldns install-pyldnsx
rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python2_sitearch}/*.la
popd
%endif
@ -347,6 +349,10 @@ rm -rf doc/man
%doc doc
%changelog
* Mon Jan 04 2021 Petr Menšík <pemensik@redhat.com> - 1.7.1-2
- Use make_build and make_install macro instead of make
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
* Thu Oct 08 2020 Petr Menšík <pemensik@redhat.com> - 1.7.1-1
- Update to 1.7.1