!2 fix build error

Merge pull request !2 from openeuler-basic/dev

bugfix-libidn2-change-rpath.patch

@@ -1,27 +1,28 @@
-From bd59ee8712c74487f02891508ad9de51fe670588 Mon Sep 17 00:00:00 2001
+From cba80c7d0aff8d43ae4d1fde2336560f9315a10c Mon Sep 17 00:00:00 2001
 From: openEuler Buildteam <buildteam@openeuler.org>
-Date: Wed, 1 Jan 2020 00:46:32 +0800
+Date: Wed, 1 Jan 2020 01:57:21 +0800
 Subject: [PATCH] change rpath
 
 ---
- libidn2-2.0.5/configure     | 4 +++-
+ configure     | 5 ++++-
- libidn2-2.0.5/m4/libtool.m4 | 4 +++-
+ m4/libtool.m4 | 5 ++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
+ 2 files changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/libidn2-2.0.5/configure b/libidn2-2.0.5/configure
+diff --git a/configure b/configure
-index c726942..f7dc93a 100755
+index c726942..fe9e5fd 100755
---- a/libidn2-2.0.5/configure
+--- a/configure
-+++ b/libidn2-2.0.5/configure
++++ b/configure
-@@ -14295,6 +14295,8 @@ fi
+@@ -14296,6 +14296,9 @@ fi
-   # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
-+ 
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
  
++  # Add ABI-specific directories to the system library path.
++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
    # Ideally, we could use ldconfig to report *all* directores which are
    # searched for libraries, however this is still not possible.  Aside from not
-@@ -14304,7 +14306,7 @@ fi
+   # being certain /sbin/ldconfig is available, command
+@@ -14304,7 +14307,7 @@ fi
    # appending ld.so.conf contents (and includes) to the search path.
    if test -f /etc/ld.so.conf; then
      lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
@@ -30,20 +31,21 @@ index c726942..f7dc93a 100755
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff --git a/libidn2-2.0.5/m4/libtool.m4 b/libidn2-2.0.5/m4/libtool.m4
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index ee80844..2ff9b60 100644
+index ee80844..f8ad53d 100644
---- a/libidn2-2.0.5/m4/libtool.m4
+--- a/m4/libtool.m4
-+++ b/libidn2-2.0.5/m4/libtool.m4
++++ b/m4/libtool.m4
-@@ -2865,6 +2865,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+@@ -2866,6 +2866,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-   # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
-+  
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" 
  
++  # Add ABI-specific directories to the system library path.
++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
    # Ideally, we could use ldconfig to report *all* directores which are
    # searched for libraries, however this is still not possible.  Aside from not
-@@ -2874,7 +2876,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+   # being certain /sbin/ldconfig is available, command
+@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
    # appending ld.so.conf contents (and includes) to the search path.
    if test -f /etc/ld.so.conf; then
      lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

libidn2.spec

@@ -1,6 +1,6 @@
 Name:           libidn2
 Version:        2.0.5
-Release:        6
+Release:        7
 Summary:        GNU IDN Library
 License:        (GPLv2+ or LGPLv3+) and GPLv3+
 URL:            https://www.gnu.org/software/libidn/#libidn2
@@ -78,6 +78,9 @@ make %{?_smp_mflags} -C tests check
 %{_datadir}/gtk-doc/
 
 %changelog
+* Wed Jan 1 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.0.5-7
+- Fix bug in patched
+
 * Wed Jan 1 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.0.5-6
 - Fix bug in patched