Hello community,
here is the log from the commit of package newt
checked in at Thu Feb 15 18:05:33 CET 2007.
--------
--- newt/newt.changes 2006-12-21 14:15:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/newt/newt.changes 2007-02-14 19:39:11.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Feb 14 19:34:16 CET 2007 - lrupp@suse.de
+
+- update to 0.52.5
+ + provide option to change text of buttons (rh#126768)
+ + don't add escape key to hot keys by default (rh#216157)
+ + fix cursor position in checkboxtree, radio button and checkbox
+ + don't force monochrome terminals to output colors
+ + highlight active compact button on monochrome terminals
+ + update translations from debian
+- removed unnecessary ldconfig call in devel package
+- removed obsolete newt-0.52.4-if1close.patch
+
+-------------------------------------------------------------------
Old:
----
newt-0.52.4-if1close.patch
newt-0.52.4.tar.bz2
New:
----
newt-0.52.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ newt.spec ++++++
--- /var/tmp/diff_new_pack.d27189/_old 2007-02-15 18:05:11.000000000 +0100
+++ /var/tmp/diff_new_pack.d27189/_new 2007-02-15 18:05:11.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package newt (Version 0.52.4)
+# spec file for package newt (Version 0.52.5)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,11 @@
BuildRequires: popt-devel python-devel slang-devel
URL: ftp://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/newt-0.52.4-2.fc7.src.rpm
Summary: Nifty Erik's Windowing Toolkit
-Version: 0.52.4
+Version: 0.52.5
Release: 1
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
-Patch1: %{name}-%{version}-if1close.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: snack = %{version}-%{release}
Requires: slang
@@ -30,7 +29,7 @@
Requires: newt = %{version}
Requires: slang
Group: Development/Libraries/C and C++
-Obsoletes: newtd
+Obsoletes: newtd <= %{version}
%description
Newt is a programming library for color text-mode widget-based user
@@ -65,7 +64,6 @@
%prep
%setup -q
-%patch1
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -92,10 +90,6 @@
%postun -p /sbin/ldconfig
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr (-,root,root)
%doc COPYING
@@ -112,6 +106,16 @@
%{_libdir}/libnewt.so
%changelog -n newt
+* Wed Feb 14 2007 - lrupp@suse.de
+- update to 0.52.5
+ + provide option to change text of buttons (rh#126768)
+ + don't add escape key to hot keys by default (rh#216157)
+ + fix cursor position in checkboxtree, radio button and checkbox
+ + don't force monochrome terminals to output colors
+ + highlight active compact button on monochrome terminals
+ + update translations from debian
+- removed unnecessary ldconfig call in devel package
+- removed obsolete newt-0.52.4-if1close.patch
* Thu Dec 21 2006 - lrupp@suse.de
- new upstream version 0.52.4: patches included upstream
+ fix entry corruption when reading multibyte characters
++++++ newt-0.52.4.tar.bz2 -> newt-0.52.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/button.c new/newt-0.52.5/button.c
--- old/newt-0.52.4/button.c 2006-10-12 16:18:38.000000000 +0200
+++ new/newt-0.52.5/button.c 2007-01-31 12:14:59.000000000 +0100
@@ -106,8 +106,10 @@
if (bu->compact) {
if (!active)
SLsmg_set_color(NEWT_COLORSET_COMPACTBUTTON);
- else
+ else if (SLtt_Use_Ansi_Colors)
SLsmg_set_color(NEWT_COLORSET_BUTTON);
+ else
+ SLsmg_set_color(NEWT_COLORSET_ACTBUTTON);
newtGotorc(co->top+ pushed, co->left + 1 + pushed);
SLsmg_write_char('<');
SLsmg_write_string(bu->text);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/checkbox.c new/newt-0.52.5/checkbox.c
--- old/newt-0.52.4/checkbox.c 2006-09-19 14:06:40.000000000 +0200
+++ new/newt-0.52.5/checkbox.c 2007-01-30 15:03:18.000000000 +0100
@@ -194,6 +194,7 @@
newtGotorc(c->top, c->left + 1);
SLsmg_write_char(*cb->result);
+ newtGotorc(c->top, c->left + 4);
}
static void cbDestroy(newtComponent co) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/checkboxtree.c new/newt-0.52.5/checkboxtree.c
--- old/newt-0.52.4/checkboxtree.c 2006-09-19 14:06:40.000000000 +0200
+++ new/newt-0.52.5/checkboxtree.c 2007-01-30 15:03:18.000000000 +0100
@@ -527,7 +527,8 @@
ct->sb->ops->draw(ct->sb);
}
- newtGotorc(currRow, co->left + 1);
+ newtGotorc(currRow, co->left +
+ (*ct->currItem ? (*ct->currItem)->depth : 0) * 3 + 4);
}
static void ctDestroy(newtComponent co) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/configure new/newt-0.52.5/configure
--- old/newt-0.52.4/configure 2006-10-13 15:53:05.000000000 +0200
+++ new/newt-0.52.5/configure 2007-01-31 15:52:50.000000000 +0100
@@ -1292,7 +1292,7 @@
PACKAGE=newt
-VERSION=$(awk '/^%define version/ {print $3}' $srcdir/newt.spec)
+VERSION=$(awk '/^Version: / {print $2}' $srcdir/newt.spec)
SONAME=0.52
ac_config_headers="$ac_config_headers config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/configure.ac new/newt-0.52.5/configure.ac
--- old/newt-0.52.4/configure.ac 2006-09-19 14:35:40.000000000 +0200
+++ new/newt-0.52.5/configure.ac 2007-01-30 10:50:16.000000000 +0100
@@ -1,7 +1,7 @@
AC_INIT([newt_pr.h])
PACKAGE=newt
-VERSION=$(awk '/^%define version/ {print $3}' $srcdir/newt.spec)
+VERSION=$(awk '/^Version: / {print $2}' $srcdir/newt.spec)
SONAME=0.52
AC_CONFIG_HEADER([config.h])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/dialogboxes.c new/newt-0.52.5/dialogboxes.c
--- old/newt-0.52.4/dialogboxes.c 2006-09-19 14:06:40.000000000 +0200
+++ new/newt-0.52.5/dialogboxes.c 2007-01-31 15:17:33.000000000 +0100
@@ -17,9 +17,11 @@
#define MAXBUF 200
#define MAXFORMAT 20
+#define BUTTONS 4
/* globals -- ick */
static int buttonHeight = 1;
+static const char * buttonText[BUTTONS];
int max (int a, int b)
{
@@ -34,21 +36,40 @@
static newtComponent (*makeButton)(int left, int right, const char * text) =
newtCompactButton;
+static const char * getButtonText(int button) {
+ const char * text;
+ if (button < 0 || button >= BUTTONS)
+ return NULL;
+
+ text = buttonText[button];
+ if (text)
+ return text;
+
+ switch (button) {
+ case 0: return dgettext(PACKAGE, "Ok");
+ case 1: return dgettext(PACKAGE, "Cancel");
+ case 2: return dgettext(PACKAGE, "Yes");
+ case 3: return dgettext(PACKAGE, "No");
+ default:
+ return NULL;
+ }
+}
+
static void addButtons(int height, int width, newtComponent form,
newtComponent * okay, newtComponent * cancel,
int flags) {
// FIXME: DO SOMETHING ABOUT THE HARD-CODED CONSTANTS
if (flags & FLAG_NOCANCEL) {
*okay = makeButton((width - 8) / 2, height - buttonHeight - 1,
- dgettext(PACKAGE, "Ok"));
+ getButtonText(BUTTON_OK));
*cancel = NULL;
newtFormAddComponent(form, *okay);
} else {
*okay = makeButton((width - 18) / 3, height - buttonHeight - 1,
- dgettext(PACKAGE,"Ok"));
+ getButtonText(BUTTON_OK));
*cancel = makeButton(((width - 18) / 3) * 2 + 9,
height - buttonHeight - 1,
- dgettext(PACKAGE,"Cancel"));
+ getButtonText(BUTTON_CANCEL));
newtFormAddComponents(form, *okay, *cancel, NULL);
}
}
@@ -491,14 +512,14 @@
case MSGBOX_MSG:
// FIXME Do something about the hard-coded constants
yes = makeButton((width - 8) / 2, height - 1 - buttonHeight,
- dgettext(PACKAGE,"Ok"));
+ getButtonText(BUTTON_OK));
newtFormAddComponent(form, yes);
break;
default:
yes = makeButton((width - 16) / 3, height - 1 - buttonHeight,
- dgettext(PACKAGE,"Yes"));
+ getButtonText(BUTTON_YES));
no = makeButton(((width - 16) / 3) * 2 + 9, height - 1 - buttonHeight,
- dgettext(PACKAGE,"No"));
+ getButtonText(BUTTON_NO));
newtFormAddComponents(form, yes, no, NULL);
if (flags & FLAG_DEFAULT_NO)
@@ -533,3 +554,9 @@
makeButton = newtCompactButton;
}
}
+
+void setButtonText(const char * text, int button) {
+ if (button < 0 || button >= BUTTONS)
+ return;
+ buttonText[button] = text;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/dialogboxes.h new/newt-0.52.5/dialogboxes.h
--- old/newt-0.52.4/dialogboxes.h 2006-08-25 15:11:37.000000000 +0200
+++ new/newt-0.52.5/dialogboxes.h 2007-01-31 14:46:03.000000000 +0100
@@ -19,6 +19,11 @@
#define DLG_CANCEL 1
#define DLG_ESCAPE 2
+#define BUTTON_OK 0
+#define BUTTON_CANCEL 1
+#define BUTTON_YES 2
+#define BUTTON_NO 3
+
int min(int a, int b);
int max(int a, int b);
@@ -32,5 +37,6 @@
int gauge(const char * text, int height, int width, poptContext optCon, int fd,
int flags);
void useFullButtons(int state);
+void setButtonText(const char * text, int button);
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/form.c new/newt-0.52.5/form.c
--- old/newt-0.52.4/form.c 2006-09-15 15:31:56.000000000 +0200
+++ new/newt-0.52.5/form.c 2007-01-31 15:06:27.000000000 +0100
@@ -471,7 +471,6 @@
if (!(form->flags & NEWT_FLAG_NOF12)) {
newtFormAddHotKey(co, NEWT_KEY_F12);
}
- /* TEST */ newtFormAddHotKey (co, NEWT_KEY_ESCAPE);
if (vertBar)
form->vertBar = vertBar;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/newt.c new/newt-0.52.5/newt.c
--- old/newt-0.52.4/newt.c 2006-09-15 15:38:21.000000000 +0200
+++ new/newt-0.52.5/newt.c 2007-01-31 12:14:16.000000000 +0100
@@ -294,11 +294,8 @@
SLtt_get_screen_size();
MonoValue = getenv(MonoEnv);
- if ( MonoValue == NULL ) {
- SLtt_Use_Ansi_Colors = 1;
- } else {
+ if ( MonoValue != NULL )
SLtt_Use_Ansi_Colors = 0;
- }
if ((ret = SLsmg_init_smg()) < 0)
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/newt-0.52.4/newt.spec new/newt-0.52.5/newt.spec
--- old/newt-0.52.4/newt.spec 2006-10-13 15:15:54.000000000 +0200
+++ new/newt-0.52.5/newt.spec 2007-01-31 15:08:52.000000000 +0100
@@ -1,9 +1,6 @@
-%define pythonver %(%{__python} -c "import sys; print sys.version[:3]")
-
Summary: A development library for text mode user interfaces.
Name: newt
-%define version 0.52.4
-Version: %{version}
+Version: 0.52.5
Release: 1%{?dist}
License: LGPL
Group: System Environment/Libraries
@@ -49,8 +46,6 @@
rm -rf $RPM_BUILD_ROOT
make instroot=$RPM_BUILD_ROOT install
-python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'%{_libdir}/python%{pythonver}",10,"%{_libdir}/python%{pythonver}")'
-
%find_lang %{name}
%clean
@@ -65,7 +60,7 @@
%doc COPYING
%{_bindir}/whiptail
%{_libdir}/libnewt.so.*
-%{_libdir}/python%{pythonver}/site-packages/*
+%{_libdir}/python?.?/site-packages/*
%{_mandir}/man1/whiptail.1*
%files devel
@@ -76,6 +71,20 @@
%{_libdir}/libnewt.so
%changelog
+* Wed Jan 31 2007 Miroslav Lichvar