branto pushed to libedit (master). "Rebase to latest upstream version (3.1.20150325)"

[notifications at fedoraproject.org]

>From bf233f85fb21e3a547df24cdd154602f238f6e78 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto at redhat.com>
Date: Thu, 26 Mar 2015 11:45:58 +0100
Subject: Rebase to latest upstream version (3.1.20150325)


diff --git a/.gitignore b/.gitignore
index d7c7b41..9145c70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ libedit-20110227-3.0.tar.gz
 /libedit-20130712-3.1.tar.gz
 /libedit-20140213-3.1.tar.gz
 /libedit-20141030-3.1.tar.gz
+/libedit-20150325-3.1.tar.gz
diff --git a/0001-Hide-protected-symbols-from-other-modules.patch b/0001-Hide-protected-symbols-from-other-modules.patch
new file mode 100644
index 0000000..8e2cca2
--- /dev/null
+++ b/0001-Hide-protected-symbols-from-other-modules.patch
@@ -0,0 +1,27 @@
+From 9ac358bf7fe9a6c322edc1fc85a5d288c5f8f92d Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto at redhat.com>
+Date: Wed, 25 Mar 2015 21:37:07 +0100
+Subject: [PATCH] Hide protected symbols from other modules
+
+---
+ src/sys.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sys.h b/src/sys.h
+index 25b14bb..f039532 100644
+--- a/src/sys.h
++++ b/src/sys.h
+@@ -71,8 +71,8 @@
+ #endif
+ 
+ #ifndef protected
+-# define protected	/* Redefined from elsewhere to "static" */
+-			/* When we want to hide everything	*/
++# define protected	__attribute__ ((visibility ("hidden")))
++			/* hide protected symbols from other modules */
+ #endif
+ 
+ #ifndef __arraycount
+-- 
+2.1.0
+
diff --git a/0001-Ignore-non-ASCII-characters-only-if-charset-is-not-U.patch b/0001-Ignore-non-ASCII-characters-only-if-charset-is-not-U.patch
deleted file mode 100644
index 44b6c4d..0000000
--- a/0001-Ignore-non-ASCII-characters-only-if-charset-is-not-U.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8c0f52589d106e5ac32d7868d7b51d3dfab6c0a5 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto at redhat.com>
-Date: Wed, 25 Mar 2015 17:33:00 +0100
-Subject: [PATCH] Ignore non-ASCII characters only if charset is not UTF-8
-
----
- src/eln.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/eln.c b/src/eln.c
-index 5bcfb4f..6023891 100644
---- a/src/eln.c
-+++ b/src/eln.c
-@@ -76,9 +76,11 @@ el_gets(EditLine *el, int *nread)
- {
- 	const wchar_t *tmp;
- 
--	el->el_flags |= IGNORE_EXTCHARS;
-+	if (!(el->el_flags & CHARSET_IS_UTF8))
-+		el->el_flags |= IGNORE_EXTCHARS;
- 	tmp = el_wgets(el, nread);
--	el->el_flags &= ~IGNORE_EXTCHARS;
-+	if (!(el->el_flags & CHARSET_IS_UTF8))
-+		el->el_flags &= ~IGNORE_EXTCHARS;
- 	return ct_encode_string(tmp, &el->el_lgcyconv);
- }
- 
--- 
-2.1.0
-
diff --git a/0002-Hide-protected-symbols-from-other-modules.patch b/0002-Hide-protected-symbols-from-other-modules.patch
deleted file mode 100644
index 8e2cca2..0000000
--- a/0002-Hide-protected-symbols-from-other-modules.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ac358bf7fe9a6c322edc1fc85a5d288c5f8f92d Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto at redhat.com>
-Date: Wed, 25 Mar 2015 21:37:07 +0100
-Subject: [PATCH] Hide protected symbols from other modules
-
----
- src/sys.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/sys.h b/src/sys.h
-index 25b14bb..f039532 100644
---- a/src/sys.h
-+++ b/src/sys.h
-@@ -71,8 +71,8 @@
- #endif
- 
- #ifndef protected
--# define protected	/* Redefined from elsewhere to "static" */
--			/* When we want to hide everything	*/
-+# define protected	__attribute__ ((visibility ("hidden")))
-+			/* hide protected symbols from other modules */
- #endif
- 
- #ifndef __arraycount
--- 
-2.1.0
-
diff --git a/libedit.spec b/libedit.spec
index 8486075..c1c58d9 100644
--- a/libedit.spec
+++ b/libedit.spec
@@ -1,16 +1,15 @@
-%global snap 20141030
-%global dir_snap 20141029
+%global snap 20150325
+%global dir_snap 20150325
 
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	3.1
-Release:	11.%{snap}cvs%{?dist}
+Release:	12.%{snap}cvs%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
 Source0:	http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
-Patch1:		0001-Ignore-non-ASCII-characters-only-if-charset-is-not-U.patch
-Patch2:		0002-Hide-protected-symbols-from-other-modules.patch
+Patch1:		0001-Hide-protected-symbols-from-other-modules.patch
 BuildRequires:	ncurses-devel
 
 %description
@@ -32,7 +31,6 @@ This package contains development files for %{name}.
 %prep
 %setup -q -n %{name}-%{dir_snap}-%{version}
 %patch1 -p1
-%patch2 -p1
 
 # Suppress rpmlint error.
 iconv -f ISO8859-1 -t UTF-8 -o ChangeLog.utf-8 ChangeLog
@@ -73,6 +71,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 %{_includedir}/editline/readline.h
 
 %changelog
+* Thu Mar 26 2015 Boris Ranto <branto at redhat.com> - 3.1-12.20150325cvs
+- Rebase to latest upstream version
+- We no longer need the patch to not ignore extchars on utf8 charset -- the patch was merged upstream
+
 * Wed Mar 25 2015 Boris Ranto <branto at redhat.com> - 3.1-11.20141030cvs
 - change the format of patches
 - hide protected functions from other modules
diff --git a/sources b/sources
index e797666..d39e52a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f18e63346d31b877cdf36b5c59b810b  libedit-20141030-3.1.tar.gz
+43cdb5df3061d78b5e9d59109871b4f6  libedit-20150325-3.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libedit.git/commit/?h=master&id=bf233f85fb21e3a547df24cdd154602f238f6e78