From 542e7e5534c80374782cbda5bf893f45fac34a25 Mon Sep 17 00:00:00 2001
From: zhangguangzhi <zhangguangzhi3@huawei.com>
Date: Sat, 11 Jan 2020 17:52:24 +0800
Subject: [PATCH] del patch to be consistent with open source

---
 recode-3.6-getcwd.patch | 11 -----------
 recode.spec             | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 recode-3.6-getcwd.patch

diff --git a/recode-3.6-getcwd.patch b/recode-3.6-getcwd.patch
deleted file mode 100644
index 5a7b870..0000000
--- a/recode-3.6-getcwd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- recode-3.6/lib/gettext.c.orig	2005-03-07 12:18:30.000000000 +0100
-+++ recode-3.6/lib/gettext.c	2005-03-07 12:23:14.000000000 +0100
-@@ -1668,8 +1668,6 @@
- # if !defined HAVE_GETCWD
- char *getwd ();
- #  define getcwd(buf, max) getwd (buf)
--# else
--char *getcwd ();
- # endif
- # ifndef HAVE_STPCPY
- static char *stpcpy PARAMS ((char *dest, const char *src));
diff --git a/recode.spec b/recode.spec
index b3d0507..7ad4657 100644
--- a/recode.spec
+++ b/recode.spec
@@ -1,6 +1,6 @@
 Name:	 recode
 Version: 3.6
-Release: 49
+Release: 50
 Summary: Converter between charsets and surfaces
 
 
@@ -9,12 +9,11 @@ URL:	 https://www.gnu.org/software/recode/
 Source0: https://github.com/rrthomas/recode/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 Patch0: recode.patch
-Patch1: recode-3.6-getcwd.patch
-Patch2: recode-bool-bitfield.patch
-Patch3: recode-flex-m4.patch
-Patch4: recode-automake.patch
-Patch5: recode-format-security.patch
-Patch6: recode-longfilename.patch
+Patch1: recode-bool-bitfield.patch
+Patch2: recode-flex-m4.patch
+Patch3: recode-automake.patch
+Patch4: recode-format-security.patch
+Patch5: recode-longfilename.patch
 
 BuildRequires: libtool texinfo
 Requires: info
@@ -95,5 +94,11 @@ fi
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Sat Jan 11 2020 zhangguangzhi<zhangguangzhi3@huawei.com> - 3.6-50
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:del patch to be consistent with open source
+
 * Fri Aug 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.6-49
 - Package init