From 8e9381f82de372e74be92d4406530c66bf239fcb Mon Sep 17 00:00:00 2001
From: openeuler_eason <liufeng111@huawei.com>
Date: Fri, 10 Jan 2020 14:43:35 +0800
Subject: [PATCH] gnutls: clean code

---
 gnutls-3.2.7-rpath.patch        | 12 ------------
 gnutls-3.6.7-no-now-guile.patch | 11 -----------
 gnutls.spec                     | 10 +++++++---
 3 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 gnutls-3.2.7-rpath.patch
 delete mode 100644 gnutls-3.6.7-no-now-guile.patch

diff --git a/gnutls-3.2.7-rpath.patch b/gnutls-3.2.7-rpath.patch
deleted file mode 100644
index 4e6aed3..0000000
--- a/gnutls-3.2.7-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure
---- gnutls-3.2.7.orig/configure	2013-11-23 11:09:49.000000000 +0100
-+++ gnutls-3.2.7/configure	2013-11-25 16:53:05.559440656 +0100
-@@ -39652,7 +39652,7 @@
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
- need_lib_prefix=unknown
- hardcode_into_libs=no
- 
diff --git a/gnutls-3.6.7-no-now-guile.patch b/gnutls-3.6.7-no-now-guile.patch
deleted file mode 100644
index d14e8df..0000000
--- a/gnutls-3.6.7-no-now-guile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/guile/src/Makefile.in	2019-03-27 11:51:55.984398001 +0100
-+++ b/guile/src/Makefile.in	2019-03-27 11:52:27.259626076 +0100
-@@ -1472,7 +1472,7 @@
- # Use '-module' to build a "dlopenable module", in Libtool terms.
- # Use '-undefined' to placate Libtool on Windows; see
- # <https://lists.gnutls.org/pipermail/gnutls-devel/2014-December/007294.html>.
--guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined
-+guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined -Wl,-z,lazy
- 
- # Linking against GnuTLS.
- GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la
diff --git a/gnutls.spec b/gnutls.spec
index c9ba58f..ce8b92c 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,14 +1,12 @@
 Name: gnutls
 Version: 3.6.9
-Release: 4
+Release: 5
 Summary: The GNU Secure Communication Protocol Library
 
 License: LGPLv2.1+ and GPLv3+
 URL: https://www.gnutls.org/
 Source0: https://www.gnupg.org/ftp/gcrypt/%{name}/v3.6/%{name}-%{version}.tar.xz
 Source1: https://www.gnupg.org/ftp/gcrypt/%{name}/v3.6/%{name}-%{version}.tar.xz.sig
-Patch1: gnutls-3.2.7-rpath.patch
-Patch2: gnutls-3.6.7-no-now-guile.patch
 Patch9000: fix-ipv6-handshake-failed.patch
 
 %bcond_without dane
@@ -196,6 +194,12 @@ make check %{?_smp_mflags}
 %endif
 
 %changelog
+* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.6.9-5
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:clean code
+
 * Tue Nov 5 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.6.9-4
 - Type:bugfix
 - Id:NA
-- 
Gitee