From 3686204c16ee5426148d222224c3a2f3b7cdf7ba Mon Sep 17 00:00:00 2001
From: xiaoweiwei <xiaoweiwei5@huawei.com>
Date: Sat, 11 Jan 2020 17:09:45 +0800
Subject: [PATCH] delete useless info

---
 ldns-1.7.0-multilib.patch | 77 ---------------------------------------
 ldns.spec                 | 17 +++++----
 2 files changed, 9 insertions(+), 85 deletions(-)
 delete mode 100644 ldns-1.7.0-multilib.patch

diff --git a/ldns-1.7.0-multilib.patch b/ldns-1.7.0-multilib.patch
deleted file mode 100644
index 428dc78..0000000
--- a/ldns-1.7.0-multilib.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/ldns-1.7.0/configure b/ldns-1.7.0/configure
-index cd087de..aeec9fb 100755
---- a/ldns-1.7.0/configure
-+++ b/ldns-1.7.0/configure
-@@ -684,6 +684,7 @@ PYTHON_SITE_PKG
- PYTHON_LDFLAGS
- PYTHON_CPPFLAGS
- PYTHON
-+PYTHON_LIB
- PYTHON_VERSION
- UNINSTALL_CONFIG_MANPAGE
- UNINSTALL_CONFIG
-@@ -14311,6 +14312,7 @@ EOD`
- 			# 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 \
-@@ -14318,6 +14320,7 @@ EOD`
- 			  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 --git a/ldns-1.7.0/packaging/ldns-config.in b/ldns-1.7.0/packaging/ldns-config.in
-index ffb2c57..950c135 100755
---- a/ldns-1.7.0/packaging/ldns-config.in
-+++ b/ldns-1.7.0/packaging/ldns-config.in
-@@ -3,13 +3,26 @@
- 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="@VERSION_INFO@"
-+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@PYTHON_LIB@"
-+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@"
- 
- for arg in $@
- do
-@@ -21,9 +34,13 @@ do
-     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 9b7045d..58da134 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -28,16 +28,15 @@
 
 Name: 		ldns
 Version: 	1.7.0
-Release: 	22
+Release: 	23
 Summary:        Low-level DNS(SEC) library with API
 
 License: 	BSD
 Url: 		https://www.nlnetlabs.nl/projects/%{name}/about/
 Source0:        https://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 
-Patch1: 	%{name}-1.7.0-multilib.patch
-Patch2: 	%{name}-1.7.0-parse-limit.patch
-Patch3: 	%{name}-1.7.0-realloc.patch
+Patch1: 	%{name}-1.7.0-parse-limit.patch
+Patch2: 	%{name}-1.7.0-realloc.patch
 
 %if 0%{snapshot}
 BuildRequires: 	libtool autoconf automake 
@@ -129,9 +128,8 @@ Man pages and other related documents for %{name}.
 %setup -qcn %{pkgname}
 pushd %{pkgname}
 
-%patch1 -p2 -b .multilib
-%patch2 -p1 -b .limit
-%patch3 -p1 -b .realloc
+%patch1 -p1 -b .limit
+%patch2 -p1 -b .realloc
 
 %if 0%{snapshot}
   rm config.guess config.sub ltmain.sh
@@ -324,5 +322,8 @@ rm -rf doc/man
 %endif
 
 %changelog
-* Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.17.9-4
+* Sat Jan 11 2020 openEuler Buildyeam <buildteam@openeuler.org> - 1.7.0-23
+- Delete useless info
+
+* Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.7.0-22
 - Package init