diff --git a/ncurses.changes b/ncurses.changes index 5c70915..ea9363c 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 3 14:17:59 UTC 2017 - jengelh@inai.de + +- Drop authors block from description and ship AUTHORS intead. +- Replace canned summaries and descriptions by + package-specific ones. +- Replace |xargs rm by simpler -delete. Use modern tar options. + ------------------------------------------------------------------- Fri Feb 3 08:00:06 UTC 2017 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index e7cbead..99bf89d 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -49,10 +49,10 @@ Obsoletes: ncurses-64bit # Version: 6.0 Release: 0 -Summary: New curses Libraries +Summary: Terminal control library +#Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base -#Git: http://ncurses.scripts.mit.edu Url: http://invisible-island.net/ncurses/ncurses.html Source0: ftp://invisible-island.net/ncurses/ncurses-6.0.tar.gz Source1: ncurses-6.0-patches.tar.bz2 @@ -75,19 +75,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build As soon as a text application needs to directly control its output to the screen (if it wants to place the cursor at location (x,y) then write text), ncurses is used. The panel and the forms libraries are -included in this package. These new libraries support color, special +included in this package. ncurses supports color, special characters, and panels. - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis - %package -n ncurses-utils Summary: Tools using the new curses libraries License: MIT @@ -109,16 +99,6 @@ tset -- terminal-initialization utility reset -- terminal initialization utility - - -Authors: --------- - Thomas E. Dickey - Eric S. Raymond - Zeyd M. Ben-Halim - Juergen Pfeifer - Pavel Curtis - %package -n terminfo-base Summary: A terminal descriptions database License: MIT @@ -131,15 +111,8 @@ This database is the official successor to the 4.4BSD termcap file and contains information about any known terminal. The ncurses library makes use of this database to use terminals correctly. - - -Authors: --------- - Thomas E. Dickey - Eric S. Raymond - %package -n libncurses5 -Summary: The New curses Libraries +Summary: Terminal control library License: MIT Group: System/Libraries Requires: terminfo-base @@ -152,21 +125,13 @@ Obsoletes: ncurses-64bit # %description -n libncurses5 -The ncurses library is used by the most curses based terminal -applications for controling its output and input to the screen. +The ncurses library is used by many terminal applications for +controlling output to the screen and input from the user. - - -Authors: --------- - Thomas E. Dickey - Eric S. Raymond - Zeyd M. Ben-Halim - Juergen Pfeifer - Pavel Curtis +This package contains the library built with the version 5 ABI. %package -n libncurses6 -Summary: The New curses Libraries +Summary: Terminal control library License: MIT Group: System/Libraries Requires: terminfo-base @@ -174,18 +139,10 @@ Provides: ncurses = %{version} Recommends: ncurses-utils = %{version} %description -n libncurses6 -The ncurses library is used by the most curses based terminal -applications for controling its output and input to the screen. +The ncurses library is used by many terminal applications for +controlling output to the screen and input from the user. - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +This package contains the library built with the version 6 ABI. %package -n terminfo Summary: A terminal descriptions database @@ -201,15 +158,8 @@ just use the Linux console, xterm, and VT100, you probably will not need this database -- a minimal /usr/share/terminfo tree for these terminals is already included in the terminfo-base package. - - -Authors: --------- - Eric S. Raymond - Thomas E. Dickey - %package -n ncurses-devel -Summary: Include Files and Libraries mandatory for Development +Summary: Development files for the ncurses6 terminal control library License: MIT Group: Development/Libraries/C and C++ Provides: ncurses6-devel @@ -224,21 +174,11 @@ Obsoletes: ncurses-devel-64bit # %description -n ncurses-devel -This package contains all necessary include files and libraries needed -to develop applications that require these. - - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +This package contains the headers needed to build against +the ncurses library in its ABI version 6 form. %package -n ncurses5-devel -Summary: Include Files and Libraries mandatory for Development +Summary: Development files for the ncurses5 terminal control library License: MIT Group: Development/Libraries/C and C++ Provides: ncurses:%{_incdir}/ncurses5/ncurses.h @@ -248,18 +188,8 @@ Requires: ncurses = %{version}-%{release} Requires: ncurses-devel = %{version}-%{release} %description -n ncurses5-devel -This package contains all necessary include files and libraries needed -to develop applications that require these. - - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +This package contains the headers needed to build against +the ncurses library in its ABI version 5 form. %package -n tack Summary: Terminfo action checker @@ -275,18 +205,11 @@ correctness of an existing entry, and to develop the correct pad timings needed to ensure that screen updates do not fall behind the incoming data stream. - - -Authors: --------- - Daniel Weaver - Eric S. Raymond - %prep %setup -q rm -f Ada95/src/terminal_interface-curses.adb rm -f mkinstalldirs -tar xfj %{S:1} +tar -xjf %{S:1} set +x for patch in patches/ncurses*.patch do @@ -294,11 +217,11 @@ do done set -x rm -rf patches/ -find -name '*.orig' | xargs -r rm -f +find -name '*.orig' -delete # replace tack from ncurses tarball with the latest version in # separate tarball rm -fr tack -tar xfz %{S:5} +tar -xzf %{S:5} mv tack-* tack %patch1 -p0 -b .327x %patch4 -p0 -b .hs @@ -554,7 +477,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # # Now rebuild libncurses and do the rest of this job # - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} @@ -565,7 +488,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src EOF %endif # must not use %jobs here (would lead to: ln: ncurses.h already exists) - find man/ -name '*.[1-8]x.*' | xargs -r rm -vf + find man/ -name '*.[1-8]x.*' -print -delete make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config @@ -606,7 +529,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src sleep 1 kill $pid %if !0%{?_crossbuild} - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif make -C c++ etip.h @@ -654,7 +577,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src sleep 1 kill $pid %if !0%{?_crossbuild} - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif make -C c++ etip.h @@ -688,7 +611,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src sleep 1 kill $pid %if !0%{?_crossbuild} - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif make -C c++ etip.h @@ -927,6 +850,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %doc %{_mandir}/man1/tput.1.gz %doc %{_mandir}/man1/tset.1.gz %doc %{_mandir}/man5/*.gz +%doc AUTHORS %files -n libncurses5 %defattr(-,root,root)