X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ncurses.spec;h=961d36b4c97fccbb9c93a9cd11a0ad6f4b79cf7d;hb=fc4744c6019800d00b9e831988f140d7099c33a5;hp=b3f4b34da639f2262e94b09755f91e4db9a34930;hpb=61bf3d5a52f1e0a48bfcd99aa9e72c689e1d8ac7;p=packages%2Fcompat-ncurses5.git

diff --git a/ncurses.spec b/ncurses.spec
index b3f4b34..961d36b 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,11 +1,11 @@
 #
 # Conditional build:
-%bcond_without	ada		# do not build Ada95 bindings
+%bcond_with	ada		# do not build Ada95 bindings
 %bcond_without	cxx		# do not build C++ ncurses bindings and demo programs
 #				# (this is neccessary to build ncurses linked with uClibc).
 %bcond_without	gpm		# build without (dynamically loadable) libgpm support
-#
-%ifarch sparc64
+
+%ifarch sparc64 x32
 %undefine with_ada
 %endif
 
@@ -19,18 +19,14 @@ Summary(ru.UTF-8):	ncurses - новая библиотека управлени
 Summary(tr.UTF-8):	Terminal kontrol kitaplığı
 Summary(uk.UTF-8):	ncurses - нова бібліотека керування терміналами
 Name:		ncurses
-Version:	5.8
-Release:	4
+Version:	6.0
+Release:	1
 License:	distributable
 Group:		Libraries
 Source0:	ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz
-# Source0-md5:	20ed3fa7599937f0ca268d9088837a64
+# Source0-md5:	ee13d052e1ead260d7c28071f46eefb1
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3b05ee835dc20c306e9af2a9d3fbf1f1
-
-# source: ftp://dickey.his.com/ncurses/5.8/
-#Patch0:		
-
 Patch100:	%{name}-screen_hpa_fix.patch
 Patch101:	%{name}-xterm_hpa_fix.patch
 Patch102:	%{name}-meta.patch
@@ -39,13 +35,15 @@ Patch104:	%{name}-mouse_trafo-warning.patch
 Patch105:	%{name}-gnome-terminal.patch
 # disable rain demo; triggers gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14998
 Patch107:	%{name}-no-rain-demo.patch
+Patch108:	%{name}-fix-nonunicode-breakage.patch
 URL:		http://dickey.his.com/ncurses/ncurses.html
 BuildRequires:	automake
 %if %{with ada}
 BuildRequires:	gcc-ada
 # gnat bug: https://bugzilla.redhat.com/show_bug.cgi?id=613407
 # gcc patch: https://bugzilla.redhat.com/attachment.cgi?id=435931
-BuildRequires:	libgnat-static
+# seems worker around when using gcc 4.6.2? --q
+#BuildRequires:	libgnat-static
 %endif
 %{?with_gpm:BuildRequires:	gpm-devel}
 %{?with_cxx:BuildRequires:	libstdc++-devel}
@@ -56,8 +54,6 @@ Obsoletes:	libncurses5
 Conflicts:	terminfo < 5.4-0.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_includedir	%{_prefix}/include/ncurses
-
 %description
 The curses library routines give the user a terminal-independent
 method of updating character screens with reasonable optimization.
@@ -137,6 +133,9 @@ Summary(pt_BR.UTF-8):	Base de dados terminfo para terminais adicionais (menos us
 Group:		Applications/Terminal
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	ncurses-extraterms
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n terminfo
 This package contains complete terminfo database. If you just use the
@@ -150,9 +149,9 @@ terminales más usados ya están en el paquete principal ncurses.
 
 %description -n terminfo -l pl.UTF-8
 Pakiet ten zawiera kompletną bazę terminfo. Jeżeli używasz terminali
-linux, console, xterm, vt100 prawdopodobnie nie bedziesz potrzebował
-tego pakietu gdyż definicje tych terminali są włączone w pakiet
-ncurses.
+linux, console, xterm, vt100, vt102 prawdopodobnie nie bedziesz
+potrzebował tego pakietu gdyż definicje tych terminali są włączone w
+pakiet ncurses.
 
 %description -n terminfo -l pt_BR.UTF-8
 Base de dados terminfo para terminais extras. As definições dos
@@ -309,7 +308,6 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 
 %prep
 %setup -q
-
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -317,20 +315,16 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 %patch104 -p1
 %patch105 -p1
 %patch107 -p1
+%patch108 -p1
 
 %build
 unset TERMINFO || :
 gcc_target=$(gcc -dumpmachine)
 gcc_version=%{cc_version}
 CFLAGS="%{rpmcflags} -DPURE_TERMINFO -D_FILE_OFFSET_BITS=64"
-export PKG_CONFIG_LIBDIR=%{_libdir}/pkgconfig
 cp -f /usr/share/automake/config.sub .
 
-%if "%{pld_release}" == "ti"
-for t in narrowc widec; do
-%else
 for t in narrowc wideclowcolor widec; do
-%endif
 install -d obj-$t
 cd obj-$t
 ../%configure \
@@ -343,29 +337,24 @@ cd obj-$t
 	--with%{!?debug:out}-debug \
 	--with%{!?with_gpm:out}-gpm \
 	--without-profile \
-	--with-termlib \
 	--with-largefile \
 	--with-ospeed=unsigned \
 	--disable-lp64 \
 	--enable-hard-tabs \
 	--enable-xmc-glitch \
 	--enable-pc-files \
+	--with-pkg-config-libdir=%{_pkgconfigdir} \
 	--enable-colorfgbg \
 	--with-chtype='long' \
 	--with-mmask-t='long' \
 	--with-manpage-aliases \
 	--with-manpage-format=normal \
-	--without-manpage-symlinks \
 	--with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \
 	--with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \
-%if "%{pld_release}" == "ti"
-	`[ "$t" != "widec" ] && echo --with-termlib=tinfo` \
-	`[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w`
-%else
-	`[ "$t" = "narrowc" ] && echo --with-termlib=tinfo` \
-	`[ "$t" = "wideclowcolor" ] && echo --with-termlib=tinfow --enable-widec --disable-ext-colors --includedir=%{_includedir}wlc` \
-	`[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --enable-ext-colors --includedir=%{_includedir}w`
-%endif
+	`[ "$t" = "narrowc" ] && echo --includedir=%{_includedir}/ncursesn` \
+	`[ "$t" = "wideclowcolor" ] && echo --enable-widec --disable-ext-colors --includedir=%{_includedir}/ncurseswlc` \
+	`[ "$t" = "widec" ] && echo --enable-widec --enable-ext-colors --enable-ext-mouse --includedir=%{_includedir}/ncursesw` \
+	--without-manpage-symlinks
 
 %{__make} -j1
 
@@ -376,51 +365,48 @@ done
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/%{_lib},%{_mandir}}
 
-%if "%{pld_release}" == "ti"
-for t in widec narrowc; do
-%else
 for t in narrowc widec; do
-%endif
 %{__make} -C obj-$t install \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT
 done
 
+# make ncursesw headers available also as default and ncurses/*.h headers
+mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses
+for l in $RPM_BUILD_ROOT%{_includedir}/ncursesw/*.h; do
+	bl=$(basename $l)
+	ln -s ../ncursesw/$bl $RPM_BUILD_ROOT%{_includedir}/ncurses/$bl
+	ln -s ncursesw/$bl $RPM_BUILD_ROOT%{_includedir}/$bl
+done
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/ncursesn
+
 ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console
 
-%if "%{pld_release}" != "ti"
-mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.6* $RPM_BUILD_ROOT/%{_lib}
+# used by /{bin,sbin} programs
 mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.6* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfow.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so
+# adjust symlinks for libncursesw.so.6 in /%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
-%else
-mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.5* $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.5* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfow.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
-%endif
-mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.so.* $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfo.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libtinfo.so
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libcurses.so
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libncurses.so
 
-ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcursesw.a
+# force ncursesw also for legacy -lncurses/-lcurses/-ltinfo linking
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libcurses.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libncurses.so
+# force wide ext libraries
+ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libformw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libform.so
+ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libmenuw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libmenu.so
+ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libpanelw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libpanel.so
 
-%if "%{pld_release}" != "ti"
-cp -a obj-wideclowcolor/lib/lib*w.so.5* $RPM_BUILD_ROOT%{_libdir}
-%endif
+# similarly for static linking
+ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcursesw.a
+ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libncurses.a
+ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcurses.a
+ln -sf libformw.a $RPM_BUILD_ROOT%{_libdir}/libform.a
+ln -sf libmenuw.a $RPM_BUILD_ROOT%{_libdir}/libmenu.a
+ln -sf libpanelw.a $RPM_BUILD_ROOT%{_libdir}/libpanel.a
+ln -sf libncurses++w.a $RPM_BUILD_ROOT%{_libdir}/libncurses++.a
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-rm $RPM_BUILD_ROOT%{_libdir}/libcurses.a
-rm $RPM_BUILD_ROOT%{_libdir}/libcursesw.a
-rm $RPM_BUILD_ROOT%{_mandir}/README.ncurses-non-english-man-pages
-
-# FIXME: should be fixed properly
-# fix too many w's
-sed -i -e 's/tinfoww/tinfow/' $RPM_BUILD_ROOT%{_bindir}/ncurses*-config $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.ncurses-non-english-man-pages
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -444,25 +430,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/toe
 %attr(755,root,root) %{_bindir}/tput
 %attr(755,root,root) %{_bindir}/tset
-%attr(755,root,root) /%{_lib}/libncurses.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libncurses.so.5
+%attr(755,root,root) %{_libdir}/libncurses.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libncurses.so.6
 %attr(755,root,root) /%{_lib}/libncursesw.so.*.*
-%if "%{pld_release}" != "ti"
 %attr(755,root,root) %ghost /%{_lib}/libncursesw.so.6
-%endif
-%attr(755,root,root) /%{_lib}/libtinfo.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libtinfo.so.5
-%attr(755,root,root) /%{_lib}/libtinfow.so.*.*
-%if "%{pld_release}" != "ti"
-%attr(755,root,root) %ghost /%{_lib}/libtinfow.so.6
-%attr(755,root,root) %{_libdir}/libncursesw.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5
-%attr(755,root,root) %{_libdir}/libtinfow.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtinfow.so.5
-%else
-%attr(755,root,root) %ghost /%{_lib}/libtinfow.so.5
-%attr(755,root,root) %ghost /%{_lib}/libncursesw.so.5
-%endif
 
 %{_datadir}/tabset
 
@@ -480,12 +451,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/terminfo/r/rxvt*
 %{_datadir}/terminfo/s/screen*
 %{_datadir}/terminfo/v/vt100
+%{_datadir}/terminfo/v/vt102
 %{_datadir}/terminfo/v/vt220
 %{_datadir}/terminfo/v/vt220-8
 %{_datadir}/terminfo/v/vt52
 %{_datadir}/terminfo/x/xterm*
 
-%{_mandir}/man[157]/*
+%{_mandir}/man1/captoinfo.1m*
+%{_mandir}/man1/clear.1*
+%{_mandir}/man1/infocmp.1m*
+%{_mandir}/man1/infotocap.1m*
+%{_mandir}/man1/reset.1*
+%{_mandir}/man1/tabs.1*
+%{_mandir}/man1/tic.1m*
+%{_mandir}/man1/toe.1m*
+%{_mandir}/man1/tput.1*
+%{_mandir}/man1/tset.1*
+%{_mandir}/man5/term.5*
+%{_mandir}/man5/terminfo.5*
+%{_mandir}/man7/term.7*
 %lang(fi) %{_mandir}/fi/man1/*
 %lang(fr) %{_mandir}/fr/man1/*
 %lang(hu) %{_mandir}/hu/man1/*
@@ -507,6 +491,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_datadir}/terminfo/r/rxvt*
 %exclude %{_datadir}/terminfo/s/screen*
 %exclude %{_datadir}/terminfo/v/vt100
+%exclude %{_datadir}/terminfo/v/vt102
 %exclude %{_datadir}/terminfo/v/vt220
 %exclude %{_datadir}/terminfo/v/vt220-8
 %exclude %{_datadir}/terminfo/v/vt52
@@ -515,19 +500,12 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc doc/html/ncurses-intro.html
-%attr(755,root,root) %{_bindir}/ncurses5-config
-%if "%{pld_release}" == "ti"
-%attr(755,root,root) %{_bindir}/ncursesw5-config
-%else
+%attr(755,root,root) %{_bindir}/ncurses6-config
 %attr(755,root,root) %{_bindir}/ncursesw6-config
-%endif
 %attr(755,root,root) %{_libdir}/libcurses.so
 %attr(755,root,root) %{_libdir}/libncurses.so
-%attr(755,root,root) %{_libdir}/libtinfo.so
 %attr(755,root,root) %{_libdir}/libcursesw.so
 %attr(755,root,root) %{_libdir}/libncursesw.so
-%attr(755,root,root) %{_libdir}/libtinfow.so
-%dir %{_includedir}
 %{_includedir}/curses.h
 %{_includedir}/eti.h
 %{_includedir}/nc_tparm.h
@@ -538,55 +516,244 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/termcap.h
 %{_includedir}/tic.h
 %{_includedir}/unctrl.h
-%dir %{_includedir}w
-%{_includedir}w/curses.h
-%{_includedir}w/eti.h
-%{_includedir}w/nc_tparm.h
-%{_includedir}w/ncurses.h
-%{_includedir}w/ncurses_dll.h
-%{_includedir}w/term.h
-%{_includedir}w/term_entry.h
-%{_includedir}w/termcap.h
-%{_includedir}w/tic.h
-%{_includedir}w/unctrl.h
-%{_pkgconfigdir}/*.pc
-
-%{_mandir}/man3/*
-%exclude %{_mandir}/man3/form*
-%exclude %{_mandir}/man3/menu*
-%exclude %{_mandir}/man3/panel*
-%lang(pl) %{_mandir}/pl/man3/*
+%dir %{_includedir}/ncurses
+%{_includedir}/ncurses/curses.h
+%{_includedir}/ncurses/eti.h
+%{_includedir}/ncurses/nc_tparm.h
+%{_includedir}/ncurses/ncurses.h
+%{_includedir}/ncurses/ncurses_dll.h
+%{_includedir}/ncurses/term.h
+%{_includedir}/ncurses/term_entry.h
+%{_includedir}/ncurses/termcap.h
+%{_includedir}/ncurses/tic.h
+%{_includedir}/ncurses/unctrl.h
+%dir %{_includedir}/ncursesw
+%{_includedir}/ncursesw/curses.h
+%{_includedir}/ncursesw/eti.h
+%{_includedir}/ncursesw/nc_tparm.h
+%{_includedir}/ncursesw/ncurses.h
+%{_includedir}/ncursesw/ncurses_dll.h
+%{_includedir}/ncursesw/term.h
+%{_includedir}/ncursesw/term_entry.h
+%{_includedir}/ncursesw/termcap.h
+%{_includedir}/ncursesw/tic.h
+%{_includedir}/ncursesw/unctrl.h
+%{_pkgconfigdir}/ncurses.pc
+%{_pkgconfigdir}/ncursesw.pc
+%{_mandir}/man1/ncurses6-config.1*
+%{_mandir}/man1/ncursesw6-config.1*
+%{_mandir}/man3/BC.3x*
+%{_mandir}/man3/COLORS.3x*
+%{_mandir}/man3/COLOR_PAIR.3x*
+%{_mandir}/man3/COLOR_PAIRS.3x*
+%{_mandir}/man3/COLS.3x*
+%{_mandir}/man3/ESCDELAY.3x*
+%{_mandir}/man3/LINES.3x*
+%{_mandir}/man3/PAIR_NUMBER.3x*
+%{_mandir}/man3/PC.3x*
+%{_mandir}/man3/SP.3x*
+%{_mandir}/man3/TABSIZE.3x*
+%{_mandir}/man3/UP.3x*
+%{_mandir}/man3/_nc_*.3x*
+%{_mandir}/man3/_trace*.3x*
+%{_mandir}/man3/acs_map.3x*
+%{_mandir}/man3/add*.3x*
+%{_mandir}/man3/assume_default_colors*.3x*
+%{_mandir}/man3/attr*.3x*
+%{_mandir}/man3/baudrate*.3x*
+%{_mandir}/man3/beep*.3x*
+%{_mandir}/man3/bkgd*.3x*
+%{_mandir}/man3/bkgrnd*.3x*
+%{_mandir}/man3/bool*.3x*
+%{_mandir}/man3/border*.3x*
+%{_mandir}/man3/box*.3x*
+%{_mandir}/man3/can_change_color*.3x*
+%{_mandir}/man3/cbreak*.3x*
+%{_mandir}/man3/ceiling_panel.3x*
+%{_mandir}/man3/chgat.3x*
+%{_mandir}/man3/clear*.3x*
+%{_mandir}/man3/clrto*.3x*
+%{_mandir}/man3/color_*.3x*
+%{_mandir}/man3/copywin.3x*
+%{_mandir}/man3/cur_term.3x*
+%{_mandir}/man3/curs_*.3x*
+%{_mandir}/man3/curscr.3x*
+%{_mandir}/man3/curses_version.3x*
+%{_mandir}/man3/def_*.3x*
+%{_mandir}/man3/default_colors.3x*
+%{_mandir}/man3/define_key*.3x*
+%{_mandir}/man3/del_curterm*.3x*
+%{_mandir}/man3/delay_output*.3x*
+%{_mandir}/man3/delch.3x*
+%{_mandir}/man3/deleteln.3x*
+%{_mandir}/man3/delscreen.3x*
+%{_mandir}/man3/delwin.3x*
+%{_mandir}/man3/derwin.3x*
+%{_mandir}/man3/doupdate*.3x*
+%{_mandir}/man3/dupwin.3x*
+%{_mandir}/man3/echo*.3x*
+%{_mandir}/man3/endwin*.3x*
+%{_mandir}/man3/erase*.3x*
+%{_mandir}/man3/filter*.3x*
+%{_mandir}/man3/flash*.3x*
+%{_mandir}/man3/flushinp*.3x*
+%{_mandir}/man3/get*.3x*
+%{_mandir}/man3/ground_panel.3x*
+%{_mandir}/man3/halfdelay*.3x*
+%{_mandir}/man3/has_*.3x*
+%{_mandir}/man3/hline*.3x*
+%{_mandir}/man3/idcok.3x*
+%{_mandir}/man3/idlok.3x*
+%{_mandir}/man3/immedok.3x*
+%{_mandir}/man3/in_*.3x*
+%{_mandir}/man3/inch*.3x*
+%{_mandir}/man3/init_color*.3x*
+%{_mandir}/man3/init_pair*.3x*
+%{_mandir}/man3/initscr.3x*
+%{_mandir}/man3/innstr.3x*
+%{_mandir}/man3/innwstr.3x*
+%{_mandir}/man3/ins*.3x*
+%{_mandir}/man3/intrflush*.3x*
+%{_mandir}/man3/inwstr.3x*
+%{_mandir}/man3/is_*.3x*
+%{_mandir}/man3/isendwin*.3x*
+%{_mandir}/man3/key*.3x*
+%{_mandir}/man3/kill*.3x*
+%{_mandir}/man3/leaveok.3x*
+%{_mandir}/man3/legacy_coding.3x*
+%{_mandir}/man3/longname.3x*
+%{_mandir}/man3/mcprint*.3x*
+%{_mandir}/man3/meta.3x*
+%{_mandir}/man3/mouse*.3x*
+%{_mandir}/man3/move.3x*
+%{_mandir}/man3/mv*.3x*
+%{_mandir}/man3/napms*.3x*
+%{_mandir}/man3/ncurses.3x*
+%{_mandir}/man3/new_prescr.3x*
+%{_mandir}/man3/newpad*.3x*
+%{_mandir}/man3/newscr.3x*
+%{_mandir}/man3/newterm*.3x*
+%{_mandir}/man3/newwin*.3x*
+%{_mandir}/man3/nl*.3x*
+%{_mandir}/man3/no*.3x*
+%{_mandir}/man3/num*.3x*
+%{_mandir}/man3/ospeed.3x*
+%{_mandir}/man3/overlay.3x*
+%{_mandir}/man3/overwrite.3x*
+%{_mandir}/man3/pair_content*.3x*
+%{_mandir}/man3/pecho*.3x*
+%{_mandir}/man3/pnoutrefresh.3x*
+%{_mandir}/man3/prefresh.3x*
+%{_mandir}/man3/printw.3x*
+%{_mandir}/man3/put*.3x*
+%{_mandir}/man3/qiflush*.3x*
+%{_mandir}/man3/raw*.3x*
+%{_mandir}/man3/redrawwin.3x*
+%{_mandir}/man3/refresh.3x*
+%{_mandir}/man3/reset_*.3x*
+%{_mandir}/man3/resetty*.3x*
+%{_mandir}/man3/resize_term*.3x*
+%{_mandir}/man3/resizeterm*.3x*
+%{_mandir}/man3/restartterm*.3x*
+%{_mandir}/man3/ripoffline*.3x*
+%{_mandir}/man3/savetty*.3x*
+%{_mandir}/man3/scanw.3x*
+%{_mandir}/man3/scr_*.3x*
+%{_mandir}/man3/scrl.3x*
+%{_mandir}/man3/scroll*.3x*
+%{_mandir}/man3/set_curterm*.3x*
+%{_mandir}/man3/set_escdelay*.3x*
+%{_mandir}/man3/set_tabsize*.3x*
+%{_mandir}/man3/set_term.3x*
+%{_mandir}/man3/setcchar.3x*
+%{_mandir}/man3/setscrreg.3x*
+%{_mandir}/man3/setsyx.3x*
+%{_mandir}/man3/setterm.3x*
+%{_mandir}/man3/setupterm.3x*
+%{_mandir}/man3/slk_*.3x*
+%{_mandir}/man3/stand*.3x*
+%{_mandir}/man3/start_color*.3x*
+%{_mandir}/man3/stdscr.3x*
+%{_mandir}/man3/str*.3x*
+%{_mandir}/man3/subpad.3x*
+%{_mandir}/man3/subwin.3x*
+%{_mandir}/man3/syncok.3x*
+%{_mandir}/man3/term*.3x*
+%{_mandir}/man3/tget*.3x*
+%{_mandir}/man3/tgoto.3x*
+%{_mandir}/man3/tiget*.3x*
+%{_mandir}/man3/timeout.3x*
+%{_mandir}/man3/tiparm.3x*
+%{_mandir}/man3/touchline.3x*
+%{_mandir}/man3/touchwin.3x*
+%{_mandir}/man3/tparm.3x*
+%{_mandir}/man3/tputs*.3x*
+%{_mandir}/man3/trace.3x*
+%{_mandir}/man3/ttytype.3x*
+%{_mandir}/man3/typeahead*.3x*
+%{_mandir}/man3/unctrl*.3x*
+%{_mandir}/man3/unget*.3x*
+%{_mandir}/man3/untouchwin.3x*
+%{_mandir}/man3/use_*.3x*
+%{_mandir}/man3/vid*.3x*
+%{_mandir}/man3/vline*.3x*
+%{_mandir}/man3/vw*.3x*
+%{_mandir}/man3/wadd*.3x*
+%{_mandir}/man3/wattr*.3x*
+%{_mandir}/man3/wbkgd*.3x*
+%{_mandir}/man3/wbkgrnd*.3x*
+%{_mandir}/man3/wborder*.3x*
+%{_mandir}/man3/wchgat.3x*
+%{_mandir}/man3/wclear.3x*
+%{_mandir}/man3/wclrto*.3x*
+%{_mandir}/man3/wcolor_set.3x*
+%{_mandir}/man3/wcursyncup.3x*
+%{_mandir}/man3/wdel*.3x*
+%{_mandir}/man3/wecho*.3x*
+%{_mandir}/man3/wenclose.3x*
+%{_mandir}/man3/werase.3x*
+%{_mandir}/man3/wget*.3x*
+%{_mandir}/man3/whline*.3x*
+%{_mandir}/man3/win*.3x*
+%{_mandir}/man3/wmouse_trafo.3x*
+%{_mandir}/man3/wmove.3x*
+%{_mandir}/man3/wnoutrefresh.3x*
+%{_mandir}/man3/wprintw.3x*
+%{_mandir}/man3/wredrawln.3x*
+%{_mandir}/man3/wrefresh.3x*
+%{_mandir}/man3/wresize.3x*
+%{_mandir}/man3/wscanw.3x*
+%{_mandir}/man3/wscrl.3x*
+%{_mandir}/man3/wsetscrreg.3x*
+%{_mandir}/man3/wstand*.3x*
+%{_mandir}/man3/wsync*.3x*
+%{_mandir}/man3/wtimeout.3x*
+%{_mandir}/man3/wtouchln.3x*
+%{_mandir}/man3/wunctrl*.3x*
+%{_mandir}/man3/wvline*.3x*
+%lang(pl) %{_mandir}/pl/man3/ncurses.3x*
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/libcurses.a
 %{_libdir}/libncurses.a
-%{_libdir}/libtinfo.a
+%{_libdir}/libcursesw.a
 %{_libdir}/libncursesw.a
-%{_libdir}/libtinfow.a
 
 %files ext
 %defattr(644,root,root,755)
-%if "%{pld_release}" == "ti"
-%attr(755,root,root) %{_libdir}/libform.so.*
-%attr(755,root,root) %{_libdir}/libmenu.so.*
-%attr(755,root,root) %{_libdir}/libpanel.so.*
-%attr(755,root,root) %{_libdir}/libformw.so.*
-%attr(755,root,root) %{_libdir}/libmenuw.so.*
-%attr(755,root,root) %{_libdir}/libpanelw.so.*
-%else
 %attr(755,root,root) %{_libdir}/libform.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libform.so.[56]
+%attr(755,root,root) %ghost %{_libdir}/libform.so.6
 %attr(755,root,root) %{_libdir}/libmenu.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmenu.so.[56]
+%attr(755,root,root) %ghost %{_libdir}/libmenu.so.6
 %attr(755,root,root) %{_libdir}/libpanel.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpanel.so.[56]
+%attr(755,root,root) %ghost %{_libdir}/libpanel.so.6
 %attr(755,root,root) %{_libdir}/libformw.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libformw.so.[56]
+%attr(755,root,root) %ghost %{_libdir}/libformw.so.6
 %attr(755,root,root) %{_libdir}/libmenuw.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmenuw.so.[56]
+%attr(755,root,root) %ghost %{_libdir}/libmenuw.so.6
 %attr(755,root,root) %{_libdir}/libpanelw.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpanelw.so.[56]
-%endif
+%attr(755,root,root) %ghost %{_libdir}/libpanelw.so.6
 
 %files ext-devel
 %defattr(644,root,root,755)
@@ -599,12 +766,73 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/form.h
 %{_includedir}/menu.h
 %{_includedir}/panel.h
-%{_includedir}w/form.h
-%{_includedir}w/menu.h
-%{_includedir}w/panel.h
-%{_mandir}/man3/form*
-%{_mandir}/man3/menu*
-%{_mandir}/man3/panel*
+%{_includedir}/ncurses/form.h
+%{_includedir}/ncurses/menu.h
+%{_includedir}/ncurses/panel.h
+%{_includedir}/ncursesw/form.h
+%{_includedir}/ncursesw/menu.h
+%{_includedir}/ncursesw/panel.h
+%{_pkgconfigdir}/form.pc
+%{_pkgconfigdir}/formw.pc
+%{_pkgconfigdir}/menu.pc
+%{_pkgconfigdir}/menuw.pc
+%{_pkgconfigdir}/panel.pc
+%{_pkgconfigdir}/panelw.pc
+%{_mandir}/man3/TYPE_ALNUM.3x*
+%{_mandir}/man3/TYPE_ALPHA.3x*
+%{_mandir}/man3/TYPE_ENUM.3x*
+%{_mandir}/man3/TYPE_INTEGER.3x*
+%{_mandir}/man3/TYPE_IPV4.3x*
+%{_mandir}/man3/TYPE_NUMERIC.3x*
+%{_mandir}/man3/TYPE_REGEXP.3x*
+%{_mandir}/man3/bottom_panel.3x*
+%{_mandir}/man3/current_field.3x*
+%{_mandir}/man3/current_item.3x*
+%{_mandir}/man3/data_ahead.3x*
+%{_mandir}/man3/data_behind.3x*
+%{_mandir}/man3/del_panel.3x*
+%{_mandir}/man3/dup_field.3x*
+%{_mandir}/man3/dynamic_field_info.3x*
+%{_mandir}/man3/field_*.3x*
+%{_mandir}/man3/form*.3x*
+%{_mandir}/man3/free_*.3x*
+%{_mandir}/man3/hide_panel.3x*
+%{_mandir}/man3/item_*.3x*
+%{_mandir}/man3/link_field*.3x*
+%{_mandir}/man3/menu*.3x*
+%{_mandir}/man3/mitem_*.3x*
+%{_mandir}/man3/move_field.3x*
+%{_mandir}/man3/move_panel.3x*
+%{_mandir}/man3/new_field*.3x*
+%{_mandir}/man3/new_form*.3x*
+%{_mandir}/man3/new_item.3x*
+%{_mandir}/man3/new_menu*.3x*
+%{_mandir}/man3/new_page.3x*
+%{_mandir}/man3/new_panel.3x*
+%{_mandir}/man3/panel*.3x*
+%{_mandir}/man3/pos_form_cursor.3x*
+%{_mandir}/man3/pos_menu_cursor.3x*
+%{_mandir}/man3/post_form.3x*
+%{_mandir}/man3/post_menu.3x*
+%{_mandir}/man3/replace_panel.3x*
+%{_mandir}/man3/scale_form.3x*
+%{_mandir}/man3/scale_menu.3x*
+%{_mandir}/man3/set_current_field.3x*
+%{_mandir}/man3/set_current_item.3x*
+%{_mandir}/man3/set_field*.3x*
+%{_mandir}/man3/set_form_*.3x*
+%{_mandir}/man3/set_item_*.3x*
+%{_mandir}/man3/set_max_field.3x*
+%{_mandir}/man3/set_menu_*.3x*
+%{_mandir}/man3/set_new_page.3x*
+%{_mandir}/man3/set_panel_userptr.3x*
+%{_mandir}/man3/set_top_row.3x*
+%{_mandir}/man3/show_panel.3x*
+%{_mandir}/man3/top_panel.3x*
+%{_mandir}/man3/top_row.3x*
+%{_mandir}/man3/unpost_form.3x*
+%{_mandir}/man3/unpost_menu.3x*
+%{_mandir}/man3/update_panels*.3x*
 
 %files ext-static
 %defattr(644,root,root,755)
@@ -626,13 +854,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cursesw.h
 %{_includedir}/etip.h
 %{_includedir}/cursslk.h
-%{_includedir}w/cursesapp.h
-%{_includedir}w/cursesf.h
-%{_includedir}w/cursesm.h
-%{_includedir}w/cursesp.h
-%{_includedir}w/cursesw.h
-%{_includedir}w/etip.h
-%{_includedir}w/cursslk.h
+%{_includedir}/ncurses/cursesapp.h
+%{_includedir}/ncurses/cursesf.h
+%{_includedir}/ncurses/cursesm.h
+%{_includedir}/ncurses/cursesp.h
+%{_includedir}/ncurses/cursesw.h
+%{_includedir}/ncurses/etip.h
+%{_includedir}/ncurses/cursslk.h
+%{_includedir}/ncursesw/cursesapp.h
+%{_includedir}/ncursesw/cursesf.h
+%{_includedir}/ncursesw/cursesm.h
+%{_includedir}/ncursesw/cursesp.h
+%{_includedir}/ncursesw/cursesw.h
+%{_includedir}/ncursesw/etip.h
+%{_includedir}/ncursesw/cursslk.h
+%{_pkgconfigdir}/ncurses++.pc
+%{_pkgconfigdir}/ncurses++w.pc
 
 %files c++-static
 %defattr(644,root,root,755)
@@ -646,6 +883,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Ada95/{README,TODO}
 %attr(755,root,root) %{_bindir}/adacurses-config
 %attr(755,root,root) %{_bindir}/adacursesw-config
-%{_libdir}/gcc/*/*/adainclude/*
-%{_libdir}/gcc/*/*/adalib/*
+%{_libdir}/gcc/*/*/adainclude/*.ad[bs]
+%{_libdir}/gcc/*/*/adalib/libAdaCurses.a
+%{_mandir}/man1/adacurses-config.1*
+%{_mandir}/man1/adacurses.1*
+%{_mandir}/man1/adacursesw-config.1*
 %endif