commit newt for openSUSE:Factory
Hello community,
here is the log from the commit of package newt for openSUSE:Factory checked in at 2012-02-02 17:58:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/newt (Old)
and /work/SRC/openSUSE:Factory/.newt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "newt", Maintainer is "lrupp@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/newt/newt.changes 2011-09-23 02:14:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.newt.new/newt.changes 2012-02-02 17:58:44.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Feb 1 10:23:33 UTC 2012 - lars@linux-schulserver.de
+
+- update to 0.52.14:
+ + fix returning strings in whiptail and whiptcl (rh#752818)
+ + fix configure to work with multiple python versions (rh#737998)
+- removed newt-0.52.13-python_version.patch : fixed upstream
+- compile with fPIC - fixes problems with _snackmodule.so
+ thanks to Joerg Steffens (bnc#734171)
+- newt-doc recommends the main package as the examples need it
+- added newt-0.52.14-incorrect-fsf-address.patch
+
+-------------------------------------------------------------------
+Sun Jan 29 19:32:51 UTC 2012 - jengelh@medozas.de
+
+- Remove redundant tags/sections per specfile guideline suggestions
+
+-------------------------------------------------------------------
Old:
----
newt-0.52.13-python_version.patch
newt-0.52.13.tar.bz2
New:
----
newt-0.52.14-incorrect-fsf-address.patch
newt-0.52.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ newt.spec ++++++
--- /var/tmp/diff_new_pack.kshQUE/_old 2012-02-02 17:58:46.000000000 +0100
+++ /var/tmp/diff_new_pack.kshQUE/_new 2012-02-02 17:58:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package newt
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,20 @@
#
-
Name: newt
%define libname lib%{name}
%define libsoname %{libname}0_52
Summary: A library for text mode user interfaces
-Version: 0.52.13
-Release: 1
License: LGPL-2.1+
Group: System/Libraries
+Version: 0.52.14
+Release: 0
Url: https://fedorahosted.org/newt/
Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
Source10: %{name}-rpmlintrc
-Patch0: newt-0.52.13-python_version.patch
+Patch0: newt-0.52.14-incorrect-fsf-address.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkg-config
BuildRequires: popt-devel
@@ -55,9 +54,8 @@
is based on the slang library.
%package -n %{libsoname}
-
-License: LGPL-2.1+
Summary: Shared libraries for Nifty Erik's Windowing Toolkit
+License: LGPL-2.1+
Group: System/Libraries
%description -n %{libsoname}
@@ -70,8 +68,8 @@
etc., to text mode user interfaces.
%package devel
-License: LGPL-2.1+
Summary: Development files for the Newt windowing toolkit
+License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{libsoname} = %{version}
Requires: python-devel
@@ -89,9 +87,11 @@
newt.
%package doc
-License: LGPL-2.1+
Summary: Tutorial for Nifty Erik's Windowing Toolkit
+License: LGPL-2.1+
Group: Documentation/Howto
+# the examples need the main package:
+Recommends: %{name} = %{version}
%description doc
This package contains a tutorial about the Newt windowing toolkit.
@@ -101,12 +101,12 @@
check boxes, radio buttons, labels, plain text fields, scrollbars,
etc., to text mode user interfaces. Newt is based on the slang library.
+%package static
# Please keep the static package as this is requested by another
# vendor for his tool. It shouldn't be a problem to keep this
# special package. (lrupp)
-%package static
-License: LGPL-2.1+
Summary: Static libraries of Nifty Erik's Windowing Toolkit
+License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
@@ -121,10 +121,8 @@
etc., to text mode user interfaces.
%package -n python-%{name}
-
-
-License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Summary: Python bindings for newt
+License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Group: System/Libraries
Requires: %{name} = %{version}
Provides: %{name}-python = %{version}
@@ -137,22 +135,19 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p0
%build
# gpm support seems to smash the stack
# --with-gpm-support
%configure --without-tcl
## make depend
-%{__make} CPPFLAGS="%{optflags}" %{?_smp_mflags} all
+%{__make} CPPFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
#docbook2txt tutorial.sgml
%install
%{__make} PYTHONVERS="python%{py_ver}" instroot="%{buildroot}" DESTDIR="%{buildroot}" install install-sh
# currently we don't support these languages
-# FIXME: add to filesystem
-## and rpmlint
-# invalid-lc-messages-dir /usr/share/locale/ast/
for lang in ast bal sr@latin wo; do
%{__rm} -rf %{buildroot}%{_datadir}/locale/$lang
done
@@ -179,9 +174,6 @@
%postun -n %{libsoname} -p /sbin/ldconfig
-%clean
-%{__rm} -rf %{buildroot}
-
%files -f %{name}.lang
%defattr (-,root,root)
%dir %{_defaultdocdir}/%{name}
++++++ newt-0.52.14-incorrect-fsf-address.patch ++++++
Index: COPYING
===================================================================
--- COPYING.orig
+++ COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
++++++ newt-0.52.13.tar.bz2 -> newt-0.52.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/newt-0.52.13/configure new/newt-0.52.14/configure
--- old/newt-0.52.13/configure 2011-06-27 14:27:40.000000000 +0200
+++ new/newt-0.52.14/configure 2011-11-11 12:00:56.000000000 +0100
@@ -3455,7 +3455,7 @@
$as_echo "skipped" >&6; }
PYTHONVERS=
else
- PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
+ PYTHONVERS=$(ls /usr/include/python2.*/Python.h 2> /dev/null | sed 's|/usr/include/\([^/]*\)/Python.h|\1|g' | tr '\n' ' ')
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHONVERS" >&5
$as_echo "$PYTHONVERS" >&6; }
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/newt-0.52.13/configure.ac new/newt-0.52.14/configure.ac
--- old/newt-0.52.13/configure.ac 2011-06-27 14:24:04.000000000 +0200
+++ new/newt-0.52.14/configure.ac 2011-11-11 12:00:15.000000000 +0100
@@ -59,7 +59,7 @@
AC_MSG_RESULT([skipped])
PYTHONVERS=
else
- PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
+ PYTHONVERS=$(ls /usr/include/python2.*/Python.h 2> /dev/null | sed 's|/usr/include/\([[^/]]*\)/Python.h|\1|g' | tr '\n' ' ')
AC_MSG_RESULT([$PYTHONVERS])
fi
AC_SUBST([PYTHONVERS])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/newt-0.52.13/dialogboxes.c new/newt-0.52.14/dialogboxes.c
--- old/newt-0.52.13/dialogboxes.c 2011-06-27 14:24:04.000000000 +0200
+++ new/newt-0.52.14/dialogboxes.c 2011-11-11 12:00:15.000000000 +0100
@@ -192,7 +192,7 @@
}
int inputBox(const char * text, int height, int width, poptContext optCon,
- int flags, const char ** result) {
+ int flags, char ** result) {
newtComponent form, entry, okay, cancel, answer, tb;
const char * val;
int pFlag = (flags & FLAG_PASSWORD) ? NEWT_FLAG_PASSWORD : 0;
@@ -212,12 +212,13 @@
addButtons(height, width, form, &okay, &cancel, flags);
answer = newtRunForm(form);
+ *result = NULL;
if (answer == cancel)
rc = DLG_CANCEL;
else if (answer == NULL)
rc = DLG_ESCAPE;
-
- *result = val;
+ else
+ *result = strdup(val);
newtFormDestroy(form);
@@ -254,7 +255,7 @@
}
int listBox(const char * text, int height, int width, poptContext optCon,
- int flags, const char *default_item, const char ** result) {
+ int flags, const char *default_item, char ** result) {
newtComponent form, okay, tb, answer, listBox;
newtComponent cancel = NULL;
const char * arg;
@@ -372,13 +373,15 @@
addButtons(height, width, form, &okay, &cancel, flags);
answer = newtRunForm(form);
+ *result = NULL;
if (answer == cancel)
rc = DLG_CANCEL;
if (answer == NULL)
rc = DLG_ESCAPE;
-
- i = (long) newtListboxGetCurrent(listBox);
- *result = itemInfo[i].tag;
+ else {
+ i = (long) newtListboxGetCurrent(listBox);
+ *result = strdup(itemInfo[i].tag);
+ }
newtFormDestroy(form);
free(itemInfo);
@@ -387,7 +390,7 @@
}
int checkList(const char * text, int height, int width, poptContext optCon,
- int useRadio, int flags, const char *** selections) {
+ int useRadio, int flags, char *** selections) {
newtComponent form, okay, tb, subform, answer;
newtComponent sb = NULL, cancel = NULL;
const char * arg;
@@ -481,40 +484,45 @@
addButtons(height, width, form, &okay, &cancel, flags);
answer = newtRunForm(form);
+ *selections = NULL;
if (answer == cancel)
rc = DLG_CANCEL;
if (answer == NULL)
rc = DLG_ESCAPE;
-
- if (useRadio) {
- answer = newtRadioGetCurrent(cbInfo[0].comp);
- *selections = malloc(sizeof(char *) * 2);
- if (*selections == NULL)
- return DLG_ERROR;
- (*selections)[0] = (*selections)[1] = NULL;
- for (i = 0; i < numBoxes; i++)
- if (cbInfo[i].comp == answer) {
- (*selections)[0] = cbInfo[i].tag;
- break;
+ else {
+ if (useRadio) {
+ answer = newtRadioGetCurrent(cbInfo[0].comp);
+ *selections = malloc(sizeof(char *) * 2);
+ if (*selections == NULL)
+ return DLG_ERROR;
+ (*selections)[0] = (*selections)[1] = NULL;
+ for (i = 0; i < numBoxes; i++)
+ if (cbInfo[i].comp == answer) {
+ (*selections)[0] = strdup(cbInfo[i].tag);
+ break;
+ }
+ } else {
+ numSelected = 0;
+ for (i = 0; i < numBoxes; i++) {
+ if (cbStates[i] != ' ') numSelected++;
}
- } else {
- numSelected = 0;
- for (i = 0; i < numBoxes; i++) {
- if (cbStates[i] != ' ') numSelected++;
- }
- *selections = malloc(sizeof(char *) * (numSelected + 1));
- if (*selections == NULL) return DLG_ERROR;
+ *selections = malloc(sizeof(char *) * (numSelected + 1));
+ if (*selections == NULL)
+ return DLG_ERROR;
+
+ numSelected = 0;
+ for (i = 0; i < numBoxes; i++) {
+ if (cbStates[i] != ' ')
+ (*selections)[numSelected++] = strdup(cbInfo[i].tag);
+ }
- numSelected = 0;
- for (i = 0; i < numBoxes; i++) {
- if (cbStates[i] != ' ')
- (*selections)[numSelected++] = cbInfo[i].tag;
+ (*selections)[numSelected] = NULL;
}
-
- (*selections)[numSelected] = NULL;
}
+ free(cbInfo);
+ free(cbStates);
newtFormDestroy(form);
return rc;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/newt-0.52.13/dialogboxes.h new/newt-0.52.14/dialogboxes.h
--- old/newt-0.52.13/dialogboxes.h 2011-06-27 14:24:04.000000000 +0200
+++ new/newt-0.52.14/dialogboxes.h 2011-11-11 12:00:15.000000000 +0100
@@ -29,11 +29,11 @@
int messageBox(const char * text, int height, int width, int type, int flags);
int checkList(const char * text, int height, int width, poptContext optCon,
- int useRadio, int flags, const char *** selections);
+ int useRadio, int flags, char *** selections);
int listBox(const char * text, int height, int width, poptContext optCon,
- int flags, const char *default_item, const char ** result);
+ int flags, const char *default_item, char ** result);
int inputBox(const char * text, int height, int width, poptContext optCon,
- int flags, const char ** result);
+ int flags, char ** result);
int gauge(const char * text, int height, int width, poptContext optCon, int fd,
int flags);
void useFullButtons(int state);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/newt-0.52.13/newt.spec new/newt-0.52.14/newt.spec
--- old/newt-0.52.13/newt.spec 2011-06-27 14:24:04.000000000 +0200
+++ new/newt-0.52.14/newt.spec 2011-11-11 12:00:15.000000000 +0100
@@ -1,7 +1,7 @@
%{!?python_sitearch: %global 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.13
+Version: 0.52.14
Release: 1%{?dist}
License: LGPLv2
Group: System Environment/Libraries
@@ -104,6 +104,10 @@
%{python_sitearch}/*.py*
%changelog
+* Fri Nov 11 2011 Miroslav Lichvar
participants (1)
-
root@hilbert.suse.de