From 84c77adfbbd7457964de5df761a90112dd07a5fc Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Wed, 23 Jan 2008 17:09:22 +0000
Subject: [PATCH] - enable slang utf8 mode (#425992) - support --disable-nls
 option (patch by Natanael Copa) - redraw screen when using entry in euc
 encodings

---
 .cvsignore                 |  2 +-
 newt-0.52.7-snack.patch    | 18 ------------------
 newt-0.52.7-whiptail.patch | 18 ------------------
 newt.spec                  | 15 ++++++++-------
 sources                    |  2 +-
 5 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 newt-0.52.7-snack.patch
 delete mode 100644 newt-0.52.7-whiptail.patch

diff --git a/.cvsignore b/.cvsignore
index fc5275f..08e89c0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-newt-0.52.7.tar.gz
+newt-0.52.8.tar.gz
diff --git a/newt-0.52.7-snack.patch b/newt-0.52.7-snack.patch
deleted file mode 100644
index 3503340..0000000
--- a/newt-0.52.7-snack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: newt/snack.py
-===================================================================
-RCS file: /usr/local/CVS/newt/snack.py,v
-retrieving revision 1.69
-retrieving revision 1.70
-diff -u -r1.69 -r1.70
---- newt/snack.py	13 Jun 2007 17:17:53 -0000	1.69
-+++ newt/snack.py	11 Jul 2007 17:00:28 -0000	1.70
-@@ -826,7 +826,8 @@
-     for n in prompts:
-         if (type(n) == types.TupleType):
-             (n, e) = n
--            e = Entry(entryWidth, e)
-+            if (type(e) in types.StringTypes):
-+                e = Entry(entryWidth, e)
-         else:
-             e = Entry(entryWidth)
- 
diff --git a/newt-0.52.7-whiptail.patch b/newt-0.52.7-whiptail.patch
deleted file mode 100644
index ada6acb..0000000
--- a/newt-0.52.7-whiptail.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: newt/whiptail.c
-===================================================================
-RCS file: /usr/local/CVS/newt/whiptail.c,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -u -r1.21 -r1.22
---- newt/whiptail.c	31 Jan 2007 13:48:15 -0000	1.21
-+++ newt/whiptail.c	25 Jun 2007 10:37:18 -0000	1.22
-@@ -569,7 +569,8 @@
-       case MODE_RADIOLIST:
- 	rc = checkList(text, height, width, optCon, 1, flags, &selections);
- 	if (rc == DLG_OKAY) {
--	    fprintf(output, "%s", selections[0]);
-+	    if (selections[0])
-+		fprintf(output, "%s", selections[0]);
- 	    free(selections);
- 	}
- 	break;
diff --git a/newt.spec b/newt.spec
index 7531311..c324170 100644
--- a/newt.spec
+++ b/newt.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: A library for text mode user interfaces
 Name: newt
-Version: 0.52.7
-Release: 4%{?dist}
+Version: 0.52.8
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -13,8 +13,6 @@ Source: newt-%{version}.tar.gz
 BuildRequires: popt-devel python-devel slang-devel
 Provides: snack = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: newt-0.52.7-snack.patch
-Patch2: newt-0.52.7-whiptail.patch
 
 %package devel
 Summary: Newt windowing toolkit development files
@@ -61,8 +59,6 @@ providing a python API for creating text mode ionterfaces.
 
 %prep
 %setup -q
-%patch1 -p1 -b .snack
-%patch2 -p1 -b .whiptail
 
 %build
 # gpm support seems to smash the stack w/ we use help in anaconda??
@@ -108,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*.py*
 
 %changelog
+* Wed Jan 23 2008 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.8-1
+- enable slang utf8 mode (#425992)
+- support --disable-nls option (patch by Natanael Copa)
+- redraw screen when using entry in euc encodings
+
 * Mon Aug 27 2007 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.7-4
 - fix segfault in whiptail when no entry is selected in radiolist
 - buildrequire popt-devel
@@ -119,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 - add back support for list of Entries in EntryWindow prompts in snack
   (#248878)
 - update license tag
-- split python module to -python subpackage (Yanko Kaneti)
+- split python module to -python subpackage (patch by Yanko Kaneti)
 - fix summary
  
 * Fri Jun 15 2007 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.7-1
diff --git a/sources b/sources
index 16e20b5..37355a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-635c6eb55033b6e0671fd2e3fc59fedc  newt-0.52.7.tar.gz
+0daef93590e9b6fd3419c871e75f9fa7  newt-0.52.8.tar.gz