rpms/ldns
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Nov 24 2014 Paul Wouters <pwouters@redhat.com> - 1.6.17-11

Browse Source 
- Only cond_without sets "with ", so use underscores
- multilib.patch was setting LIBDIR_SEC once without leading /
This commit is contained in:
Paul Wouters 2014-11-24 15:23:05 -05:00
parent 8e5ecac1fc
commit 4dddaadff7
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ldns-1.6.17-multilib.patch
View File

@ -49,7 +49,7 @@ diff -Naur ldns-1.6.17-orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-
+ ;;
+ * )
+ LIBDIR="/usr/lib"
+ LIBDIR_SEC="usr/lib64"
+ LIBDIR_SEC="/usr/lib64"
+ ;;
+esac
+

32
ldns.spec
View File

@ -3,7 +3,7 @@
%{?!with_perl: %global with_perl 1}
%{?!with_ecc: %global with_ecc 1}
%if %{with python}
%if %{with_python}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{?filter_setup:
@ -24,7 +24,7 @@
Summary: Low-level DNS(SEC) library with API
Name: ldns
Version: 1.6.17
Release: 10%{?dist}
Release: 12%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/%{name}/
@ -46,10 +46,10 @@ BuildRequires: doxygen
# for snapshots only
# BuildRequires: libtool, autoconf, automake
%if %{with python}
%if %{with_python}
BuildRequires: python-devel, swig
%endif
%if %{with perl}
%if %{with_perl}
BuildRequires: perl-ExtUtils-MakeMaker
%endif
Requires: ca-certificates
@ -84,7 +84,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
Collection of tools to get, check or alter DNS(SEC) data.
%if %{with python}
%if %{with_python}
%package -n python-ldns
Summary: Python extensions for ldns
Group: Applications/System
@ -97,7 +97,7 @@ Conflicts: ldns-python < 1.6.17-4
Python extensions for ldns
%endif
%if %{with perl}
%if %{with_perl}
%package -n perl-ldns
Summary: Perl extensions for ldns
Group: Applications/System
@ -140,14 +140,14 @@ export CFLAGS CXXFLAGS LDFLAGS
%configure \
--disable-rpath \
--disable-static \
%if %{with ecc}
%if %{with_ecc}
--enable-gost \
--enable-ecdsa \
%else
--disable-gost \
--disable-ecdsa \
%endif
%if %{with python}
%if %{with_python}
--with-pyldns \
%endif
--with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt \
@ -157,7 +157,7 @@ export CFLAGS CXXFLAGS LDFLAGS
pushd drill
%configure \
--disable-rpath \
%if %{with ecc}
%if %{with_ecc}
--enable-gost \
--enable-ecdsa \
%else
@ -172,7 +172,7 @@ popd
pushd examples
%configure \
--disable-rpath \
%if %{with ecc}
%if %{with_ecc}
--enable-gost \
--enable-ecdsa \
%else
@ -185,7 +185,7 @@ pushd examples
popd
# We cannot use the built-in --with-p5-dns-ldns
%if %{with perl}
%if %{with_perl}
pushd contrib/DNS-LDNS
perl Makefile.PL INSTALLDIRS=vendor INC="-I. -I../.."
make
@ -219,7 +219,7 @@ rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la
install -D -m644 packaging/libldns.pc %{buildroot}%{_libdir}/pkgconfig/ldns.pc
make -C drill DESTDIR=%{buildroot} install
make -C examples DESTDIR=%{buildroot} install
%if %{with perl}
%if %{with_perl}
make -C contrib/DNS-LDNS DESTDIR=%{buildroot} pure_install
chmod 755 %{buildroot}%{perl_vendorarch}/auto/DNS/LDNS/LDNS.so
rm -f %{buildroot}%{perl_vendorarch}/auto/DNS/LDNS/{.packlist,LDNS.bs}
@ -253,12 +253,12 @@ rm -rf %{buildroot}
%{_includedir}/ldns/*.h
%{_mandir}/man3/*
%if %{with python}
%if %{with_python}
%files -n python-ldns
%{python_sitearch}/*
%endif
%if %{with perl}
%if %{with_perl}
%files -n perl-ldns
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
@ -268,6 +268,10 @@ rm -rf %{buildroot}
%doc doc
%changelog
* Mon Nov 24 2014 Paul Wouters <pwouters@redhat.com> - 1.6.17-11
- Only cond_without sets "with ", so use underscores
- multilib.patch was setting LIBDIR_SEC once without leading /
* Thu Oct 02 2014 Paul Wouters <pwouters@redhat.com> - 1.6.17-10
- Fix and install the .pc (pkg-config) file