diff --git a/.gitignore b/.gitignore index b3e6705..c45ac86 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/newt-0.52.15.tar.gz +/newt-0.52.16.tar.gz diff --git a/newt-options.patch b/newt-options.patch deleted file mode 100644 index d359414..0000000 --- a/newt-options.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 6c7007a6a2662f12eca3b8008651e4d8b0de6539 -Author: Miroslav Lichvar -Date: Fri Apr 5 15:58:53 2013 +0200 - - add missing whiptail options to help and man page - -diff --git a/whiptail.1 b/whiptail.1 -index 41ab640..ea212a8 100644 ---- a/whiptail.1 -+++ b/whiptail.1 -@@ -87,7 +87,7 @@ The dialog box will open with the cursor over the - Set the default item in a menu box. - Normally the first item in the box is the default. - .TP --.B \-\-fb -+\fB\-\-fb\fR, \fB\-\-fullbuttons\fR - Use full buttons. (By default, - .B whiptail - uses compact buttons). -@@ -117,6 +117,9 @@ The menu, checklist and radiolist widgets will display tags only, not - the item strings. The menu widget still needs some items specified, - but checklist and radiolist expect only tag and status. - .TP -+.B \-\-notags -+Don't display tags in the menu, checklist and radiolist widgets. -+.TP - .BI \-\-separate\-output - For checklist widgets, output result one line at a time, with no - quoting. This facilitates parsing by another program. -@@ -144,6 +147,12 @@ Force the display of a vertical scrollbar. - .BI \-\-topleft - Put window in top-left corner. - .TP -+\fB\-h\fR, \fB\-\-help\fR -+Print a help message and exit. -+.TP -+\fB\-v\fR, \fB\-\-version\fR -+Print version information and exit. -+.TP - .B Box Options - .TP - .BI \-\-yesno " text height width" -diff --git a/whiptail.c b/whiptail.c -index a631bc4..7932d8b 100644 ---- a/whiptail.c -+++ b/whiptail.c -@@ -51,19 +51,22 @@ static void usage(int err) { - "\t--clear clear screen on exit\n" - "\t--defaultno default no button\n" - "\t--default-item set default string\n" -- "\t--fb use full buttons\n" -+ "\t--fb, --fullbuttons use full buttons\n" - "\t--nocancel no cancel button\n" - "\t--yes-button set text of yes button\n" - "\t--no-button set text of no button\n" - "\t--ok-button set text of ok button\n" - "\t--cancel-button set text of cancel button\n" -- "\t--noitem display tags only\n" -+ "\t--noitem don't display items\n" -+ "\t--notags don't display tags\n" - "\t--separate-output output one line at a time\n" - "\t--output-fd output to fd, not stdout\n" - "\t--title display title\n" - "\t--backtitle <backtitle> display backtitle\n" - "\t--scrolltext force vertical scrollbars\n" -- "\t--topleft put window in top-left corner\n\n")); -+ "\t--topleft put window in top-left corner\n" -+ "\t-h, --help print this message\n" -+ "\t-v, --version print version information\n\n")); - exit(err ? DLG_ERROR : 0 ); - } - diff --git a/newt.spec b/newt.spec index 27a0b08..0d0a13b 100644 --- a/newt.spec +++ b/newt.spec @@ -1,13 +1,12 @@ %{!?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.15 +Version: 0.52.16 Release: 3%{?dist} License: LGPLv2 Group: System Environment/Libraries URL: https://fedorahosted.org/newt/ Source: https://fedorahosted.org/released/newt/newt-%{version}.tar.gz -Patch1: newt-options.patch BuildRequires: popt-devel python-devel slang-devel BuildRequires: docbook-utils Provides: snack = %{version}-%{release} @@ -57,7 +56,6 @@ providing a python API for creating text mode ionterfaces. %prep %setup -q -%patch1 -p1 -b .options %build # gpm support seems to smash the stack w/ we use help in anaconda?? diff --git a/sources b/sources index 742beee..ec75f23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -343ee3a0fd0eacdb7c508a1e1cfabf65 newt-0.52.15.tar.gz +6ce923015cf87ef2c17779d24692f573 newt-0.52.16.tar.gz