#
# 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
Summary(tr.UTF-8): Terminal kontrol kitaplığı
Summary(uk.UTF-8): ncurses - нова бібліотека керування терміналами
Name: ncurses
-Version: 5.9
-Release: 19
+Version: 6.0
+Release: 0.1
License: distributable
Group: Libraries
Source0: ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz
-# Source0-md5: 8cb9c412e5f2d96bc6f459aa8c6282a1
+# 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.9/
-Patch0: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120616-patch.sh.bz2
-# Patch0-md5: f54bf02a349f96a7c4f0d00922f3a0d4
-Patch1: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120622.patch.gz
-# Patch1-md5: 36050b2f6827f1b0c6e067ad926832fd
-Patch2: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120630.patch.gz
-# Patch2-md5: 8f7e13c2bf0cbbea534b77ef93511384
-Patch3: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120707.patch.gz
-# Patch3-md5: baca6817f5783f07473f6af87b6aaa39
-Patch4: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120714.patch.gz
-# Patch4-md5: 30bad59b6406dee788201d285f9ea8f7
-Patch5: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120721.patch.gz
-# Patch5-md5: e5de2a1348f468a4488e6be2537b6dee
-Patch6: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120728.patch.gz
-# Patch6-md5: a5e0e9e40e06e7c40764d09728feaf23
-Patch7: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120804.patch.gz
-# Patch7-md5: 6f36d88f0c52ee4d988d1750707dedf2
-Patch8: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120811.patch.gz
-# Patch8-md5: 55dd0f570891aef807fb3f72013e5dda
-Patch9: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120825.patch.gz
-# Patch9-md5: 7562120899d6fc598163bc691c6ebf18
-Patch10: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120826.patch.gz
-# Patch10-md5: 1e15d50ff5599f2cd261f01cb698c69c
-Patch11: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120901.patch.gz
-# Patch11-md5: fba4b71aa2a2b5dea10bf329ac4ba781
-Patch12: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120902.patch.gz
-# Patch12-md5: 3df2d816f4253ab3f8bc237250d40cb5
-Patch13: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120903.patch.gz
-# Patch13-md5: 85f145b705bfa80ae4efcc6990fb3ec1
-Patch14: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120908.patch.gz
-# Patch14-md5: b353472fa2ff73bac2e471fb012a9c18
-Patch15: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20120922.patch.gz
-# Patch15-md5: 94470fef0c012a51fdce05870eca5571
-Patch16: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121006.patch.gz
-# Patch16-md5: 049fc841bd6cc9b81b1ebef48cc1d8ff
-Patch17: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121013.patch.gz
-# Patch17-md5: 23ba3541e3f28b33b712ccf01dc91f83
-Patch18: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121017.patch.gz
-# Patch18-md5: 6127b212055aa7eaff8a67cbd32eab3c
-Patch19: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121026.patch.gz
-# Patch19-md5: 070bf5029f8a58ec9244215e0b5862ef
-Patch20: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121102.patch.gz
-# Patch20-md5: 12b439167f1001e9e759524a6e56f2ad
-Patch21: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121110.patch.gz
-# Patch21-md5: 1d207ae3773325c5904ccb99a13c02eb
-Patch22: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121117.patch.gz
-# Patch22-md5: e6e77f332dcea086927cab51b914c6f2
-Patch23: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121124.patch.gz
-# Patch23-md5: e0fffab860632597dfb816223bc628a7
-Patch24: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121201.patch.gz
-# Patch24-md5: 0a89add847ff9e43c5f99eaa677b5eaa
-Patch25: ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20121208.patch.gz
-# Patch25-md5: 2c7a522807d9253138679f14eb2e693b
-Patch26: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20121215.patch.gz
-# Patch26-md5: ed250b707e8270169bcf21533a362468
-Patch27: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20121222.patch.gz
-# Patch27-md5: 297e341ae7e3a09033e91de848e6f723
-Patch28: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20121229.patch.gz
-# Patch28-md5: 762ddc8539c0bf07be3688e0eca7781e
-Patch29: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20130105.patch.gz
-# Patch29-md5: 93981da71a5d3e3c7c9077e03297cf22
-Patch30: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20130112.patch.gz
-# Patch30-md5: d7978571a4675477a3e98e542b20c2f0
-Patch31: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20130119.patch.gz
-# Patch31-md5: aa40c0dc6da9f8fd9feae7d1789b92f0
-Patch32: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20130126.patch.gz
-# Patch32-md5: 73a4a971feb694e626558e732362bcfb
-Patch33: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20130202.patch.gz
-# Patch33-md5: cabea79e04fd2ef3a52964eb8e82f730
-Patch34: ftp://dickey.his.com/ncurses/5.9/ncurses-5.9-20130209.patch.gz
-# Patch34-md5: f94a173644ede1b357a50ef42d7ae91e
Patch100: %{name}-screen_hpa_fix.patch
Patch101: %{name}-xterm_hpa_fix.patch
Patch102: %{name}-meta.patch
%{?with_ada:BuildRequires: m4}
BuildRequires: pkgconfig
BuildRequires: sharutils
-# for compatibility with old PLD packages
-%ifarch %{x8664} ppc64 sparc64 s390x
-Provides: libtinfo.so.5()(64bit)
-Provides: libtinfow.so.5()(64bit)
-Provides: libtinfow.so.6()(64bit)
-%else
-Provides: libtinfo.so.5
-Provides: libtinfow.so.5
-Provides: libtinfow.so.6
-%endif
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.
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
%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
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-
%patch100 -p1
%patch101 -p1
%patch102 -p1
--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/ \
- `[ "$t" = "wideclowcolor" ] && echo --enable-widec --disable-ext-colors --includedir=%{_includedir}wlc` \
- `[ "$t" = "widec" ] && echo --enable-widec --enable-ext-colors --includedir=%{_includedir}w`
+ `[ "$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
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
+# 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}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libtinfo.so
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.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
-mv -f $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib}
-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
-# binary compatibility for packages using libncursesw.so.5 (without ext-colors)
-cp -a obj-wideclowcolor/lib/libncursesw.so.5* $RPM_BUILD_ROOT%{_libdir}
-# binary compatibility for packages usign libtinfo.so.5/libtinfow.so.5/libtinfow.so.6
-ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.5.*) $RPM_BUILD_ROOT/%{_lib}/libtinfo.so.5
-ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT/%{_lib}/libtinfow.so.6
-ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.5
+# 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
%clean
%post ext -p /sbin/ldconfig
%postun ext -p /sbin/ldconfig
-%triggerpostun -- %{name} < 5.9-3
-# rpm seems to remove them as those was %ghosts in ncurses < 5.9-3
-# despite existing now as normal files/symlinks
-ln -sf /%{_lib}/libncurses.so.5.* /%{_lib}/libtinfo.so.5
-ln -sf /%{_lib}/libncursesw.so.6.* /%{_lib}/libtinfow.so.6
-ln -sf %{_libdir}/libncursesw.so.5.* %{_libdir}/libtinfow.so.5
-exit 0
-
%files
%defattr(644,root,root,755)
%doc ANNOUNCE README
%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.*.*
%attr(755,root,root) %ghost /%{_lib}/libncursesw.so.6
-%attr(755,root,root) %{_libdir}/libncursesw.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5
-%attr(755,root,root) /%{_lib}/libtinfo.so.5
-%attr(755,root,root) /%{_lib}/libtinfow.so.6
-%attr(755,root,root) %{_libdir}/libtinfow.so.5
%{_datadir}/tabset
%{_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
%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
%files devel
%defattr(644,root,root,755)
%doc doc/html/ncurses-intro.html
-%attr(755,root,root) %{_bindir}/ncurses5-config
+%attr(755,root,root) %{_bindir}/ncurses6-config
%attr(755,root,root) %{_bindir}/ncursesw6-config
%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
%{_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
+%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/ncurses5-config.1*
+%{_mandir}/man1/ncurses6-config.1*
%{_mandir}/man1/ncursesw6-config.1*
%{_mandir}/man3/BC.3x*
%{_mandir}/man3/COLORS.3x*
%files static
%defattr(644,root,root,755)
+%{_libdir}/libcurses.a
%{_libdir}/libncurses.a
+%{_libdir}/libcursesw.a
%{_libdir}/libncursesw.a
%files ext
%defattr(644,root,root,755)
%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]
+%attr(755,root,root) %ghost %{_libdir}/libpanelw.so.6
%files ext-devel
%defattr(644,root,root,755)
%{_includedir}/form.h
%{_includedir}/menu.h
%{_includedir}/panel.h
-%{_includedir}w/form.h
-%{_includedir}w/menu.h
-%{_includedir}w/panel.h
+%{_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
%{_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