From aa4494201e4acada0901b24310ef5ac57e321f29 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Jul 04 2008 21:12:53 +0000
Subject: - Remote the workaround introduced in previous change

- Disable Visual Bell test

---

diff --git a/perl-Term-ReadLine-Gnu-1.17-malloc.patch b/perl-Term-ReadLine-Gnu-1.17-malloc.patch
deleted file mode 100644
index 1575e39..0000000
--- a/perl-Term-ReadLine-Gnu-1.17-malloc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-http://rt.perl.org/rt3/Ticket/Display.html?id=56500
-_THIS COULD HAVE BEEN MUCH WORSE_
-
-Lubomir Rintel <lkundrak@v3.sk>
-
-diff -urp Term-ReadLine-Gnu-1.17.orig/Gnu.pm Term-ReadLine-Gnu-1.17/Gnu.pm
---- Term-ReadLine-Gnu-1.17.orig/Gnu.pm	2008-02-07 15:12:43.000000000 +0100
-+++ Term-ReadLine-Gnu-1.17/Gnu.pm	2008-07-01 18:36:50.000000000 +0200
-@@ -68,6 +68,11 @@ END
-     }
- }
- 
-+# Tidy up what could have been malloc()'d
-+END {
-+    new Term::ReadLine::Gnu('_ultimate_destroyer_')->env_workaround ();
-+}
-+
- {
-     use Exporter ();
-     use DynaLoader;
-diff -urp Term-ReadLine-Gnu-1.17.orig/Gnu.xs Term-ReadLine-Gnu-1.17/Gnu.xs
---- Term-ReadLine-Gnu-1.17.orig/Gnu.xs	2008-02-06 15:49:47.000000000 +0100
-+++ Term-ReadLine-Gnu-1.17/Gnu.xs	2008-07-01 18:21:59.000000000 +0200
-@@ -1317,6 +1317,32 @@ MODULE = Term::ReadLine::Gnu		PACKAGE = 
-  #	2.1 Basic Behavior
-  #
- 
-+void
-+env_workaround()
-+    PROTOTYPE:
-+    CODE:
-+        {
-+		int i;
-+		char **envptr;
-+		// We intentionally not free old pointers,
-+		// given we can't really sure where do they come from
-+		// and how were they allocated
-+		for (i = 0; environ[i] != NULL; i++) {
-+			char *oldptr;
-+
-+			if (strncmp (environ[i], "LINES=", 6) == 0 || 
-+			    strncmp (environ[i], "COLUMNS=", 8) == 0) {
-+				oldptr = environ[i];
-+				environ[i] = safesysmalloc (strlen (oldptr)+1);
-+				strcpy (environ[i], oldptr);
-+			}
-+		}
-+		i++;
-+		envptr = safesysmalloc (sizeof (environ) * i);
-+		memcpy (envptr, environ, sizeof (environ) * i);
-+		environ = envptr;
-+        }
-+
-  # The function name "readline()" is reserved for a method name.
- 
- t_xstr
diff --git a/perl-Term-ReadLine-Gnu.spec b/perl-Term-ReadLine-Gnu.spec
index 0915078..55fe92b 100644
--- a/perl-Term-ReadLine-Gnu.spec
+++ b/perl-Term-ReadLine-Gnu.spec
@@ -1,12 +1,12 @@
 Name:           perl-Term-ReadLine-Gnu
 Version:        1.17a
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for the GNU Readline/History Library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Term-ReadLine-Gnu/
 Source0:        http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz
-Patch0:         perl-Term-ReadLine-Gnu-1.17-malloc.patch
+Patch0:         perl-Term-ReadLine-Gnu-1.17-vbtest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  ncurses-devel
@@ -22,7 +22,7 @@ An implementation of Term::ReadLine using the GNU Readline/History Library.
 
 %prep
 %setup -q -n Term-ReadLine-Gnu-1.17
-%patch0 -p1 -b .malloc
+%patch0 -p1 -b .vbtest
 
 
 %build
@@ -67,11 +67,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 02 2008 Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com> 1.17a-4
+- Remote the workaround introduced in previous change
+- Disable Visual Bell test
+
 * Tue Jul 01 2008 Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com> 1.17a-3
 - Patch around rt#56500 perl bug hoping for better tomorrows
 
 * Sat Jun 28 2008 Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com> 1.17a-2
-- Run the test suite with a pseudo-terminal
+- Tun the test suite with a pseudo-terminal
 
 * Fri Jun 27 2008 Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com> 1.17a-1
 - Specfile autogenerated by cpanspec 1.75.