diff --git a/.cvsignore b/.cvsignore index f9ab900..b35cc3a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,3 @@ -ncurses-5.3-20030105.patch.gz -ncurses-5.3-20030111.patch.gz -ncurses-5.3-20030118.patch.gz +ncurses-5.3-20030517.patch.gz ncurses-5.3.tar.bz2 -patch-5.3-20021231.sh.gz +patch-5.3-20030510.sh.gz diff --git a/ncurses.spec b/ncurses.spec index 3bbeb84..959175a 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,8 +1,9 @@ Summary: A CRT screen handling and optimization package. Name: ncurses Version: 5.3 -%define PATCHDATE 20021231 -Release: 4 +%define PATCHDATE 20030510 +%define includedirw %{_includedir}/ncursesw +Release: 9 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -11,14 +12,19 @@ Source2: ncurses-linux Source3: ncurses-linux-m Source4: ncurses-resetall.sh Patch1: ftp://dickey.his.com/ncurses/5.3/patch-5.3-%{PATCHDATE}.sh.gz -Patch2: ftp://dickey.his.com/ncurses/5.3/ncurses-5.3-20030105.patch.gz -Patch3: ftp://dickey.his.com/ncurses/5.3/ncurses-5.3-20030111.patch.gz -Patch4: ftp://dickey.his.com/ncurses/5.3/ncurses-5.3-20030118.patch.gz +Patch2: ftp://dickey.his.com/ncurses/5.3/ncurses-5.3-20030517.patch.gz Patch11: ncurses-5.2-rxvt.patch Patch12: ncurses-5.2-nocbt.patch Patch13: ncurses-5.3-autoconf25.patch Patch14: ncurses-5.3-20030131-terminfo.patch +Patch15: ncurses-5.3-safe-sprintf.patch +BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root +%ifarch ia64 x86_64 ppc64 s390x +Obsoletes: elf32(%{name}) +%else +Provides: elf32(%{name}) +%endif %description The curses library routines are a terminal-independent method of @@ -30,6 +36,12 @@ discontinued 4.4 BSD classic curses library. Summary: The development files for applications that use ncurses. Group: Development/Libraries Requires: ncurses = %{PACKAGE_VERSION} +%ifarch ia64 x86_64 ppc64 s390x +Obsoletes: elf32(%{name}) +%else +Provides: elf32(%{name}) +%endif + %description devel The header files and libraries for developing applications that use @@ -38,6 +50,14 @@ the ncurses CRT screen handling and optimization package. Install the ncurses-devel package if you want to develop applications which will use ncurses. +Use the following compiler flags to build against the ncurses library: + +-lncurses +(compile and link against the regular ncurses library) + +-I %{includedirw} -lncursesw +(compile and link against the wide-character, UTF-8, library) + %package c++-devel Summary: C++ bindings to ncurses Group: System Environment/Libraries @@ -49,44 +69,68 @@ C++ bindings to ncurses %prep %setup -q -zcat %{PATCH1} |sh -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +zcat %PATCH1 | sh +%patch2 -p1 -b .20030517 %patch13 -p1 -b .ac25 %patch14 -p1 -b .rh -find . -name "*.orig" -exec rm -f {} \; +%patch15 -p1 -b .snprintf %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" %define optflags $CFLAGS -%configure \ - --with-normal --with-shared --without-debug --without-profile \ - --with-cxx --without-ada --enable-sigwinch --enable-hard-tabs \ - --with-ospeed='unsigned int' + +WITH_GPM="--with-gpm" + +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 \ + --with-install-prefix=${RPM_BUILD_ROOT} 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 --enable-widec \ + --with-install-prefix=${RPM_BUILD_ROOT} +make +cd .. %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT includedir=/usr/include/ncurses -ln -s ../l/linux $RPM_BUILD_ROOT/usr/share/terminfo/c/console -ln -s ncurses/curses.h $RPM_BUILD_ROOT/usr/include/ncurses.h -for I in curses unctrl eti form menu panel term; do - ln -sf ncurses/$I.h $RPM_BUILD_ROOT/usr/include/$I.h +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 .. + +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 + +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 -sf libncurses.a $RPM_BUILD_ROOT%{_libdir}/libcurses.a + +ln -sf libncurses.a ${RPM_BUILD_ROOT}%{_libdir}/libcurses.a +ln -sf libncursesw.a ${RPM_BUILD_ROOT}%{_libdir}/libcursesw.a %ifarch sparc -install -c -m644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/terminfo/l/linux -install -c -m644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/terminfo/l/linux-m +install -c -m644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux +install -c -m644 %SOURCE3 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux-m %endif -make clean -C test +install -c -m 755 %SOURCE4 ${RPM_BUILD_ROOT}%{_bindir}/resetall -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so.*.* - -# the resetall script -install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall +rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/key_defined.3x.20030517.gz +rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517.gz %post -p /sbin/ldconfig @@ -98,6 +142,7 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall %attr(755,root,root) %{_libdir}/lib*.so.* %{_datadir}/terminfo %{_datadir}/tabset +%{_libdir}/lib*.so %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* @@ -108,24 +153,11 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall %doc test %doc doc/html/hackguide.html %doc doc/html/ncurses-intro.html -%{_libdir}/lib*.so -%{_libdir}/libcurses.a -%{_libdir}/libform.a -%{_libdir}/libmenu.a -%{_libdir}/libncurses.a -%{_libdir}/libpanel.a +%{_libdir}/lib*.a + %dir %{_includedir}/ncurses -%{_includedir}/ncurses/curses.h -%{_includedir}/ncurses/cursslk.h -%{_includedir}/ncurses/eti.h -%{_includedir}/ncurses/form.h -%{_includedir}/ncurses/menu.h -%{_includedir}/ncurses/ncurses_dll.h -%{_includedir}/ncurses/ncurses.h -%{_includedir}/ncurses/panel.h -%{_includedir}/ncurses/termcap.h -%{_includedir}/ncurses/term.h -%{_includedir}/ncurses/unctrl.h +%{_includedir}/ncurses/*.h +%{_includedir}/ncursesw/*.h %{_includedir}/curses.h %{_includedir}/ncurses.h %{_includedir}/eti.h @@ -144,10 +176,41 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall %{_includedir}/ncurses/etip.h %{_libdir}/libncurses++.a +%{_libdir}/libncurses++w.a + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Sep 11 2003 Adrian Havill 5.3-9 +- remove not-so safe-sprintf configure option because the code does + not appear to be stable enough for some apps. (#103790) + +* Wed Aug 20 2003 Adrian Havill 5.3-8.1 +- RHEL bump + +* Wed Aug 20 2003 Adrian Havill 5.3-8 +- multilib patch (#91211) + +* Mon Aug 11 2003 Adrian Havill 5.3-7 +- fixed the safe sprintf code that was enabled in the previous release + by the configure parameter. (#101486) + +* Mon Jun 16 2003 Elliot Lee 5.3-6.1 +- Fix ac25 patch, make it easy to turn off GPM support + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Adrian Havill 5.3-5 +- added latest rollup patch with widec/UTF8 centric weekly (20030517) +- added --enable-widec to configure (#86311) + original work done by Mr. Sam +- require sharutils (#86605) +- add gpm, xmc support +- add debug syms back into package +- updated autoconf/configure patch + * Thu Feb 6 2003 Bill Nottingham 5.3-4 - fix debuginfo package diff --git a/sources b/sources index 4f49218..78b80c9 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ -b8596a070fb085eb6856e5b344800c7b ncurses-5.3-20030105.patch.gz -6666c4bb48337ed3ccc7b2aab2516052 ncurses-5.3-20030111.patch.gz -da4be82a2d09d9946e1bb34502d83b56 ncurses-5.3-20030118.patch.gz +9f72e754093bbe4c45743d582fa05d19 ncurses-5.3-20030517.patch.gz 3c080fc3caeb0d1e3423f7ed204f8b5b ncurses-5.3.tar.bz2 -65e7d8d7bc009ca17f2dee27f298df1f patch-5.3-20021231.sh.gz +fa4bd25046dcf5b00440f5d24c79a263 patch-5.3-20030510.sh.gz