]> git.pld-linux.org Git - packages/compat-ncurses5.git/blobdiff - ncurses.spec
Revert "- gcc 5.2 rebuild"
[packages/compat-ncurses5.git] / ncurses.spec
index e89371589169753e4f37a6d6644062a4bf387412..961d36b4c97fccbb9c93a9cd11a0ad6f4b79cf7d 100644 (file)
@@ -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,74 +19,14 @@ Summary(ru.UTF-8):  ncurses - новая библиотека управлени
 Summary(tr.UTF-8):     Terminal kontrol kitaplığı
 Summary(uk.UTF-8):     ncurses - нова бібліотека керування терміналами
 Name:          ncurses
-Version:       5.9
-Release:       11
+Version:       6.0
+Release:       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-20110409.patch.gz
-# Patch0-md5:  c26b6e57a553d1589c351fd975db715e
-Patch1:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110416.patch.gz
-# Patch1-md5:  0cd0a279dae5cb10c1f39a6663620f64
-Patch2:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110423.patch.gz
-# Patch2-md5:  5cfe7668aeb60e7d49411171cf7a3794
-Patch3:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110430.patch.gz
-# Patch3-md5:  279b7bc2ee75fd87c203a06f33da7f28
-Patch4:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110507.patch.gz
-# Patch4-md5:  0b49ef1f095782b7ec11443bf65807f6
-Patch5:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110514.patch.gz
-# Patch5-md5:  9259e608ede1cda1be0121ce9ebc09b3
-Patch6:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110521.patch.gz
-# Patch6-md5:  02df6dc377fca5aa657bf433f557f369
-Patch7:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110528.patch.gz
-# Patch7-md5:  8f76dfdda995d28db6aa81df400acfc8
-Patch8:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110604.patch.gz
-# Patch8-md5:  9096cf2939126cf846879805fcacf54f
-Patch9:                ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110611.patch.gz
-# Patch9-md5:  e015ed8feda52fdb42175972bbae524c
-Patch10:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110625.patch.gz
-# Patch10-md5: aef165913af8c4429ea6952ada251050
-Patch11:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110626.patch.gz
-# Patch11-md5: 8b142ba05d78a4ecf544bd332aca0e89
-Patch12:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110702.patch.gz
-# Patch12-md5: 82c3c02925e43fa229a474a6b0bff5b1
-Patch13:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110716.patch.gz
-# Patch13-md5: cd4d1a529ac4c7bc651d098b25103080
-Patch14:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110723.patch.gz
-# Patch14-md5: 41cc27d25b5af10aa44b961ec8e0c4c1
-Patch15:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110730.patch.gz
-# Patch15-md5: ca003e277018cfe72a1c3952423b0c48
-Patch16:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110807.patch.gz
-# Patch16-md5: ebe7c70030af0fe49c6573e43a78f7d8
-Patch17:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110813.patch.gz
-# Patch17-md5: 2766fb18a0d63837558ceae3b499ae01
-Patch18:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110820.patch.gz
-# Patch18-md5: 420ba8a3afeb6bf1309536194499d965
-Patch19:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110903.patch.gz
-# Patch19-md5: 2f63ea871e1895adaf7a9135c2936c4e
-Patch20:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110910.patch.gz
-# Patch20-md5: 03749caa4e905cdb7d57c92865c6e17a
-Patch21:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110917.patch.gz
-# Patch21-md5: 22170a078353f5fe96cc086c5a85ee9d
-Patch22:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110924.patch.gz
-# Patch22-md5: 42dd0410027c1c3540fa2e1e371feb6a
-Patch23:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20110925.patch.gz
-# Patch23-md5: 9f48157b702810d58feeed62b1a67e9a
-Patch24:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20111001.patch.gz
-# Patch24-md5: f41728e7c130c2c6eabf77927ecf3c53
-Patch25:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20111008.patch.gz
-# Patch25-md5: 8140d9fcb821b10d78d2a09582e79929
-Patch26:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20111015.patch.gz
-# Patch26-md5: 372175cdbc82a14a15052ad0d2d30e0d
-Patch27:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20111022.patch.gz
-# Patch27-md5: 89a820ab5eae53ead7a6e66e6fdd1cec
-Patch28:       ftp://dickey.his.com/ncurses/5.9/%{name}-5.9-20111030.patch.gz
-# Patch28-md5: 815b149dca4306d51306211f13f7d0a4
 Patch100:      %{name}-screen_hpa_fix.patch
 Patch101:      %{name}-xterm_hpa_fix.patch
 Patch102:      %{name}-meta.patch
@@ -110,22 +50,10 @@ BuildRequires:     gcc-ada
 %{?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.
@@ -205,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
@@ -218,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
@@ -377,36 +308,6 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 
 %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
-
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -448,11 +349,12 @@ cd obj-$t
        --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
 
@@ -468,30 +370,42 @@ for t in narrowc widec; do
        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
@@ -516,15 +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.*.*
 %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
 
@@ -542,6 +451,7 @@ 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
@@ -581,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
@@ -589,15 +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
+%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
@@ -608,20 +516,31 @@ 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
+%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*
@@ -741,7 +660,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/scanw.3x*
 %{_mandir}/man3/scr_*.3x*
 %{_mandir}/man3/scrl.3x*
-%{_mandir}/man3/scroll.3x*
 %{_mandir}/man3/scroll*.3x*
 %{_mandir}/man3/set_curterm*.3x*
 %{_mandir}/man3/set_escdelay*.3x*
@@ -817,23 +735,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %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)
@@ -846,9 +766,12 @@ 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
+%{_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
@@ -931,13 +854,20 @@ 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
 
This page took 0.093313 seconds and 4 git commands to generate.