- update to patch 20060701

- don't strip libraries, chmod +x them
- move .so links to devel package
- add gpm-devel to buildrequires
- spec cleanup

.cvsignore

@@ -1 +1,3 @@
 ncurses-5.5.tar.bz2
+ncurses-5.5-20060701.patch.gz
+patch-5.5-20060625.sh.gz

ncurses.spec

@@ -1,8 +1,7 @@
 Summary: A CRT screen handling and optimization package.
 Name: ncurses
 Version: 5.5
-%define includedirw %{_includedir}/ncursesw
-Release: 19
+Release: 20
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -10,12 +9,10 @@ Source0: ftp://dickey.his.com/ncurses/ncurses-%{version}.tar.bz2
 Source1: ncurses-linux
 Source2: ncurses-linux-m
 Source3: ncurses-resetall.sh
-#Source5: term.sh
-Patch1: ncurses-5.4-xterm-kbs.patch
-Patch2: ncurses-5.4-filter.patch
-Patch3: ncurses-5.4-endwinfilter.patch
-Patch4: ncurses-5.5-cmppad.patch
-BuildRequires: sharutils
+Source4: patch-5.5-20060625.sh.gz
+Patch1: ncurses-5.5-20060701.patch.gz
+Patch5: ncurses-5.4-xterm-kbs.patch
+BuildRequires: sharutils gpm-devel
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -42,71 +39,51 @@ Use the following compiler flags to build against the ncurses library:
 -lncurses
 (compile and link against the regular ncurses library)
 
--I %{includedirw} -lncursesw
+-I %{_includedir}/ncursesw -lncursesw
 (compile and link against the wide-character, UTF-8, library)
 
 %prep
 %setup -q
+zcat %{SOURCE4} | sh > /dev/null
+%patch1 -p1
 
-
-%patch1 -p1 -b .xterm-kbs
-%patch2 -p1 -b .filter
-%patch3 -p1 -b .endwinfilter
-%patch4 -p1 -b .cmppad
+%patch5 -p1 -b .xterm-kbs
 
 %build
-CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES"
-%define optflags $CFLAGS
-
-#WITH_GPM="--with-gpm"
-#WITHOUT_XTERM_NEW="--without-xterm-new"
-
 mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
-%configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \
-   $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \
-   --enable-colorfgbg $WITHOUT_XTERM_NEW \
-   --with-install-prefix=${RPM_BUILD_ROOT} \
-   --with-chtype=long
+%configure \
+    --with-shared --without-ada --with-ospeed=unsigned \
+    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \
+    --with-install-prefix=${RPM_BUILD_ROOT} \
+    --includedir=%{_includedir}/ncurses \
+    --with-chtype=long
 make
 cd ../widec
 ln -s ../configure .
-%configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \
-   $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \
-   --enable-colorfgbg $WITHOUT_XTERM_NEW --enable-widec \
-   --with-install-prefix=${RPM_BUILD_ROOT} \
-   --with-chtype=long
+%configure --enable-widec \
+    --with-shared --without-ada --with-ospeed=unsigned \
+    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \
+    --with-install-prefix=${RPM_BUILD_ROOT} \
+    --includedir=%{_includedir}/ncursesw \
+    --with-chtype=long
 make
 cd ..
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
 
-cd widec
-make install includedir=%{_includedir}/ncurses
-mkdir -p ${RPM_BUILD_ROOT}%{includedirw}
-mv ${RPM_BUILD_ROOT}%{_includedir}/ncurses/* ${RPM_BUILD_ROOT}%{includedirw}
-cd ../narrowc
-make install includedir=%{_includedir}/ncurses
-cd ..
+make -C narrowc install
+make -C widec install
 
-ln -s %{_datadir}/terminfo/l/linux ${RPM_BUILD_ROOT}%{_datadir}/terminfo/c/console
-ln -s %{_includedir}/ncurses/curses.h ${RPM_BUILD_ROOT}%{_includedir}/ncurses.h
+chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
+chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
 
-for header in curses.h unctrl.h eti.h form.h menu.h panel.h term.h
-   do ln -sf ncurses/${header} ${RPM_BUILD_ROOT}%{_includedir}/${header}
-done
+ln -s ../l/linux ${RPM_BUILD_ROOT}%{_datadir}/terminfo/c/console
 
-#find ${RPM_BUILD_ROOT}%{_libdir} | grep -e "so.%{version}$" |  xargs strip --strip-unneeded
-
-for sofile in form formw menu menuw panel panelw ncurses ncursesw
-do
-  strip --strip-unneeded ${RPM_BUILD_ROOT}%{_libdir}/lib${sofile}.so.%{version}
-done
+ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \
+    ${RPM_BUILD_ROOT}%{_includedir}
 
 ln -sf libncurses.a ${RPM_BUILD_ROOT}%{_libdir}/libcurses.a
 ln -sf libncursesw.a ${RPM_BUILD_ROOT}%{_libdir}/libcursesw.a
@@ -117,12 +94,8 @@ install -c -m644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux-m
 %endif
 
 install -c -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/resetall
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
-#install -c -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
 
-#rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/key_defined.3x.20030517*
-#rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
-rm -Rf ${RPM_BUILD_ROOT}%{_libdir}/terminfo
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 
 %post -p /sbin/ldconfig
 
@@ -131,11 +104,9 @@ rm -Rf ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 %files
 %defattr(-,root,root)
 %doc README ANNOUNCE doc/html/announce.html
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%{_libdir}/lib*.so.*
 %{_datadir}/terminfo
 %{_datadir}/tabset
-%{_libdir}/lib*.so
-#%{_sysconfdir}/profile.d/term.sh
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -148,6 +119,7 @@ rm -Rf ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 %doc doc/html/ncurses-intro.html
 %doc c++/README*
 %{_libdir}/lib*.a
+%{_libdir}/lib*.so
 %dir %{_includedir}/ncurses
 %dir %{_includedir}/ncursesw
 %{_includedir}/ncurses/*.h
@@ -167,6 +139,13 @@ rm -Rf ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Jul 07 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-20
+- update to patch 20060701
+- don't strip libraries, chmod +x them
+- move .so links to devel package
+- add gpm-devel to buildrequires
+- spec cleanup
+
 * Mon Feb 27 2006 Miroslav Lichvar <mlichvar@redhat.com> - 5.5-19
 - avoid comparing padding in cchar_t structure (#182024)
 

sources

@@ -1 +1,3 @@
 2a8dfd42ce4286f0c8b67698b0e45e73  ncurses-5.5.tar.bz2
+b3eae4c2ff35929f4cff7a594f845abd  patch-5.5-20060625.sh.gz
+afdb339e6bc6d524178b1f2538f98f96  ncurses-5.5-20060701.patch.gz