[ldns: 4/4] ported multilib patch to 1.6.17, fix rpmlint warnings on perl tmp files

[Paul Wouters]

commit b0ea93106b9590594c5c1e6e7591e9031537b763
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jan 10 21:03:34 2014 -0500

    ported multilib patch to 1.6.17, fix rpmlint warnings on perl tmp files

 ldns-1.6.16-multilib.patch |  106 --------------------------------------------
 ldns-1.6.17-multilib.patch |   75 +++++++++++++++++++++++++++++++
 ldns.spec                  |   10 ++++-
 3 files changed, 84 insertions(+), 107 deletions(-)
---
diff --git a/ldns-1.6.17-multilib.patch b/ldns-1.6.17-multilib.patch
new file mode 100644
index 0000000..fc8216b
--- /dev/null
+++ b/ldns-1.6.17-multilib.patch
@@ -0,0 +1,75 @@
+diff -Naur ldns-1.6.17-orig/configure ldns-1.6.17/configure
+--- ldns-1.6.17-orig/configure	2014-01-10 16:04:50.000000000 -0500
++++ ldns-1.6.17/configure	2014-01-10 20:22:39.138190093 -0500
+@@ -662,6 +662,7 @@
+ PYTHON_LDFLAGS
+ PYTHON_CPPFLAGS
+ PYTHON
++PYTHON_LIB
+ PYTHON_VERSION
+ UNINSTALL_CONFIG_MANPAGE
+ UNINSTALL_CONFIG
+@@ -13599,6 +13600,7 @@
+ 			# use the official shared library
+ 			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+ 			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
++			PYTHON_LIB="$ac_python_library"
+ 		else
+ 			# old way: use libpython from python_configdir
+ 			ac_python_libdir=`$PYTHON -c \
+@@ -13606,6 +13608,7 @@
+ 			  import os; \
+ 			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+ 			PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
++			PYTHON_LIB="python$ac_python_version"
+ 		fi
+ 
+ 		if test -z "PYTHON_LDFLAGS"; then
+diff -Naur ldns-1.6.17-orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-config.in
+--- ldns-1.6.17-orig/packaging/ldns-config.in	2014-01-10 16:04:41.000000000 -0500
++++ ldns-1.6.17/packaging/ldns-config.in	2014-01-10 20:33:13.033665804 -0500
+@@ -3,13 +3,25 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ VERSION="@PACKAGE_VERSION@"
+-CFLAGS="@CFLAGS@"
+-CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
+-LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
+ LIBS="@LIBS@ @LIBSSL_LIBS@"
+-LIBDIR="@libdir@"
+ INCLUDEDIR="@includedir@"
+ LIBVERSION="@LIBLDNS_CURRENT at .@LIBLDNS_REVISION at .@LIBLDNS_AGE@"
++ARCH="`uname -m`"
++
++case $ARCH in
++       x86_64 | amd64 | sparc64 | s390x | ppc64)
++
++               LIBDIR="/usr/lib64"
++               LIBDIR_SEC="/usr/lib"
++               ;;
++       * )
++               LIBDIR="/usr/lib"
++               LIBDIR_SEC="usr/lib64"
++               ;;
++esac
++
++LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l at PYTHON_LIB@"
++LDFLAGS_SEC="@LDFL
+ 
+ for arg in $@
+ do
+@@ -21,9 +33,13 @@
+     then
+         echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
+     fi
++    if [ $arg = "--libs_sec" ]
++    then
++        echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
++    fi
+     if [ $arg = "-h" ] || [ $arg = "--help" ]
+     then
+-        echo "Usage: $0 [--cflags] [--libs] [--version]"
++        echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
+     fi
+     if [ $arg = "--version" ]
+     then
diff --git a/ldns.spec b/ldns.spec
index 491b0b5..f4774b4 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -7,6 +7,10 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
+%if %{with_perl}
+%{?perl_default_filter}
+%endif
+
 Summary: Low-level DNS(SEC) library with API
 Name: ldns
 Version: 1.6.17
@@ -14,6 +18,7 @@ Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
+Patch1: ldns-1.6.17-multilib.patch
 Group: System Environment/Libraries
 BuildRequires: libpcap-devel, openssl-devel, gcc-c++, doxygen,
 # for snapshots only
@@ -72,6 +77,7 @@ This package contains documentation for the ldns library
 
 %prep
 %setup -q 
+%patch1 -p1
 # To built svn snapshots
 # rm config.guess config.sub ltmain.sh
 # aclocal
@@ -146,6 +152,8 @@ rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la
    cd contrib/DNS-LDNS
    make  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}
 %endif
 
 %files 
@@ -188,7 +196,7 @@ rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la
 - Updated to 1.6.17
 - Enable perl bindings via new ldns-perl sub-package
 - Enable ECDSA/GOST which is now allowed in Fedora
-- Removed patches merged upstream
+- Removed patches merged upstream, ported multilib patch to 1.6.17
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.16-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild