SHA256
1
0
forked from pool/ncurses
OBS User unknown 2007-12-06 01:05:01 +00:00 committed by Git OBS Bridge
parent 122a561bc0
commit ab8501ce5f
3 changed files with 108 additions and 67 deletions

12
ncurses-5.6-overwrite.dif Normal file
View File

@ -0,0 +1,12 @@
Make ncurses-config report the correct directory for ncurses.h.
--- configure 2007/10/29 13:59:32 1.9
+++ configure 2007/10/29 14:18:12
@@ -5253,6 +5253,7 @@
fi;
echo "$as_me:5254: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite"
echo "$as_me:5257: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Dec 5 17:35:53 CET 2007 - werner@suse.de
- Add compatibility header files (bug #337412)
-------------------------------------------------------------------
Mon Oct 29 15:51:12 CET 2007 - pth@suse.de
- Fix configure so that ncurses-config doesn't erroneously
report ncurses.h to reside in /usr/include/ncurses (#337412).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 5 16:23:03 CEST 2007 - werner@suse.de Wed Sep 5 16:23:03 CEST 2007 - werner@suse.de

View File

@ -17,9 +17,9 @@ BuildRequires: gcc-c++ gpm
%define tabset() %{_datadir}/%{0}/%{1} %define tabset() %{_datadir}/%{0}/%{1}
License: X11/MIT License: X11/MIT
Group: System/Libraries Group: System/Libraries
Autoreqprov: on AutoReqProv: on
Version: 5.6 Version: 5.6
Release: 38 Release: 50
Summary: New curses Libraries Summary: New curses Libraries
Source0: ncurses-%{version}.tar.bz2 Source0: ncurses-%{version}.tar.bz2
Url: http://invisible-island.net/ncurses/ncurses.html Url: http://invisible-island.net/ncurses/ncurses.html
@ -28,7 +28,11 @@ Source2: handle.linux
Patch0: ncurses-%{version}.dif Patch0: ncurses-%{version}.dif
Patch1: ncurses-5.3-printw.dif Patch1: ncurses-5.3-printw.dif
Patch2: ncurses-5.6-pthread.dif Patch2: ncurses-5.6-pthread.dif
Patch3: ncurses-5.6-overwrite.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
%global _incdir %{_includedir}
%description %description
As soon as a text application needs to directly control its output to As soon as a text application needs to directly control its output to
@ -49,9 +53,9 @@ Authors:
%package -n terminfo %package -n terminfo
Summary: A terminal descriptions database Summary: A terminal descriptions database
License: Public Domain, Freeware, # COPYRIGHTS AND OTHER DELUSIONS License: Public Domain, Freeware
Group: System/Base Group: System/Base
Autoreqprov: on AutoReqProv: on
%description -n terminfo %description -n terminfo
This is the terminfo reference database, maintained in the ncurses This is the terminfo reference database, maintained in the ncurses
@ -73,9 +77,9 @@ Authors:
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
License: X11/MIT License: X11/MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: ncurses:/usr/include/ncurses.h Provides: ncurses:%{_incdir}/ncurses.h
Requires: ncurses = %{version}-%{release}, /usr/bin/tack Requires: ncurses = %{version}-%{release}, %{_bindir}/tack
Autoreqprov: on AutoReqProv: on
%description -n ncurses-devel %description -n ncurses-devel
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
@ -95,9 +99,9 @@ Authors:
Summary: Terminfo action checker Summary: Terminfo action checker
License: GPL v2 or later License: GPL v2 or later
Group: Development/Tools/Building Group: Development/Tools/Building
Provides: ncurses-devel:/usr/bin/tack Provides: ncurses-devel:%{_bindir}/tack
Requires: ncurses = %{version}-%{release} Requires: ncurses = %{version}-%{release}
Autoreqprov: on AutoReqProv: on
%description -n tack %description -n tack
This package contains the tack utility to help to build a new terminfo This package contains the tack utility to help to build a new terminfo
@ -118,16 +122,12 @@ Authors:
tar Oxfj %{SOURCE1} | patch -p1 -s tar Oxfj %{SOURCE1} | patch -p1 -s
%patch -P 1 -p0 -b .va %patch -P 1 -p0 -b .va
%patch -P 2 -p0 -b .pt %patch -P 2 -p0 -b .pt
%patch -P 3 -p0 -b .ow
%patch -P 0 -p0 %patch -P 0 -p0
%build %build
test ! -f /.buildenv || . /.buildenv test ! -f /.buildenv || . /.buildenv
OPATH=$PATH OPATH=$PATH
PREFIX=%{_prefix}
LIBDIR=${PREFIX}/%{_lib}
DATADIR=${PREFIX}/share
INCDIR=${PREFIX}/include
MANDIR=%{_mandir}
FALLBK="xterm,linux,vt100,vt102" FALLBK="xterm,linux,vt100,vt102"
CC=gcc CC=gcc
CXX=g++ CXX=g++
@ -193,15 +193,15 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
--enable-symlinks \ --enable-symlinks \
--enable-sigwinch \ --enable-sigwinch \
--enable-colorfgbg \ --enable-colorfgbg \
--prefix=${PREFIX} \ --prefix=%{_prefix} \
--exec-prefix=${PREFIX} \ --exec-prefix=%{_prefix}\
--libdir=${LIBDIR} \ --libdir=%{_libdir} \
--datadir=${DATADIR} \ --datadir=%{_datadir} \
--mandir=${MANDIR} \ --mandir=%{_mandir} \
--includedir=${INCDIR} \ --includedir=%{_incdir} \
"${WITHCHTYPE}" \ "${WITHCHTYPE}" \
--with-ticlib=tic \ --with-ticlib=tic \
--with-install-prefix=${RPM_BUILD_ROOT} --with-install-prefix=%{buildroot}
# #
# This is a hack to be able to boot strap # This is a hack to be able to boot strap
# a libncurses with correct fallback.c. # a libncurses with correct fallback.c.
@ -228,7 +228,7 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
make make
GZIP="-9" GZIP="-9"
export GZIP export GZIP
test -n "${RPM_BUILD_ROOT}" && rm -rf ${RPM_BUILD_ROOT}/* test -n "%{buildroot}" && rm -rf %{buildroot}/*
make install make install
# #
# Now use --enable-widec for UTF8/wide character support. # Now use --enable-widec for UTF8/wide character support.
@ -243,39 +243,39 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
GZIP="-9" GZIP="-9"
export GZIP export GZIP
make install.libs install.includes make install.libs install.includes
mkdir -p ${RPM_BUILD_ROOT}/%{_lib} mkdir -p %{buildroot}/%{_lib}
for lib in libncurses libncursesw for lib in libncurses libncursesw
do do
mv ${RPM_BUILD_ROOT}%{_libdir}/${lib}.so.* ${RPM_BUILD_ROOT}/%{_lib}/ mv %{buildroot}%{_libdir}/${lib}.so.* %{buildroot}/%{_lib}/
ln -sf /%{_lib}/${lib}.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/${lib}.so ln -sf /%{_lib}/${lib}.so.%{version} %{buildroot}%{_libdir}/${lib}.so
done done
chmod 0755 ${RPM_BUILD_ROOT}/%{_lib}/lib*.so.* chmod 0755 %{buildroot}/%{_lib}/lib*.so.*
chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so.* chmod 0755 %{buildroot}/%{_libdir}/lib*.so.*
chmod a-x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.a chmod a-x %{buildroot}/%{_libdir}/lib*.a
test -n "${RPM_BUILD_ROOT}" || ldconfig -N test -n "%{buildroot}" || ldconfig -N
mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/ncurses mkdir -p %{buildroot}%{_defaultdocdir}/ncurses
bzip2 -c misc/terminfo.src > misc/terminfo.src.bz2 bzip2 -c misc/terminfo.src > misc/terminfo.src.bz2
install -m 644 misc/terminfo.src.bz2 ${RPM_BUILD_ROOT}%{_defaultdocdir}/ncurses/ install -m 644 misc/terminfo.src.bz2 %{buildroot}%{_defaultdocdir}/ncurses/
install -m 644 doc/html/*.html ${RPM_BUILD_ROOT}%{_defaultdocdir}/ncurses/ install -m 644 doc/html/*.html %{buildroot}%{_defaultdocdir}/ncurses/
bzip2 doc/ncurses-intro.doc -c > doc/ncurses-intro.txt.bz2 bzip2 doc/ncurses-intro.doc -c > doc/ncurses-intro.txt.bz2
install -m 644 doc/ncurses-intro.txt.bz2 ${RPM_BUILD_ROOT}%{_defaultdocdir}/ncurses/ install -m 644 doc/ncurses-intro.txt.bz2 %{buildroot}%{_defaultdocdir}/ncurses/
bzip2 doc/hackguide.doc -c > doc/hackguide.txt.bz2 bzip2 doc/hackguide.doc -c > doc/hackguide.txt.bz2
install -m 644 doc/hackguide.txt.bz2 ${RPM_BUILD_ROOT}%{_defaultdocdir}/ncurses/ install -m 644 doc/hackguide.txt.bz2 %{buildroot}%{_defaultdocdir}/ncurses/
mkdir -p ${RPM_BUILD_ROOT}/etc mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p ${RPM_BUILD_ROOT}/usr/share/misc mkdir -p %{buildroot}%{_miscdir}
cd ncurses/ cd ncurses/
sh ./run_cmd.sh tic -C -r ../misc/terminfo.src | grep -E -v '^#' > termcap sh ./run_cmd.sh tic -C -r ../misc/terminfo.src | grep -E -v '^#' > termcap
# Gererate new termcap entries for various linux consoles # Gererate new termcap entries for various linux consoles
TERMCAP=termcap \ TERMCAP=termcap \
TERMINFO=${RPM_BUILD_ROOT}%{_datadir}/terminfo \ TERMINFO=%{buildroot}%{_datadir}/terminfo \
bash %{SOURCE2} bash %{SOURCE2}
install -m 0644 termcap.new ${RPM_BUILD_ROOT}/usr/share/misc/termcap install -m 0644 termcap.new %{buildroot}%{_miscdir}/termcap
cd ../ cd ../
if test `/usr/bin/id -u` = '0' ; then if test `%{_bindir}/id -u` = '0' ; then
chown root:root ${RPM_BUILD_ROOT}/usr/share/misc/termcap chown root:root %{buildroot}%{_miscdir}/termcap
chmod 0644 ${RPM_BUILD_ROOT}/usr/share/misc/termcap chmod 0644 %{buildroot}%{_miscdir}/termcap
fi fi
ln -sf /usr/share/misc/termcap ${RPM_BUILD_ROOT}/etc/termcap ln -sf %{_miscdir}/termcap %{buildroot}%{_sysconfdir}/termcap
(cat > default.list) <<-EOF (cat > default.list) <<-EOF
%{tabset std} %{tabset std}
%{tabset stdcrt} %{tabset stdcrt}
@ -319,12 +319,21 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
%{terminfo x/xterm-nic} %{terminfo x/xterm-nic}
%{terminfo x/xterm-r6} %{terminfo x/xterm-r6}
EOF EOF
find ${RPM_BUILD_ROOT}%{tabset ""} ${RPM_BUILD_ROOT}%{terminfo ""} \ find %{buildroot}%{tabset ""} %{buildroot}%{terminfo ""} \
\( -type f -or -type l \) | \ \( -type f -or -type l \) | \
sed "s@^${RPM_BUILD_ROOT}@@g" | \ sed "s@^%{buildroot}@@g" | \
grep -v -F -x -f default.list \ grep -v -F -x -f default.list \
> extension.list > extension.list
rm -f $RPM_BUILD_ROOT/usr/lib/terminfo rm -f %{buildroot}%{_prefix}/lib/terminfo
mkdir -p %{buildroot}%{_incdir}/ncurses
mkdir -p %{buildroot}%{_incdir}/ncursesw
cat > %{buildroot}%{_incdir}/ncursesw/ncurses.h <<-"EOF"
#ifndef _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE_EXTENDED
#endif
#include <ncurses.h>
EOF
ln -sf ../ncurses.h %{buildroot}%{_incdir}/ncurses/
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -332,20 +341,20 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
%files -f default.list %files -f default.list
%defattr(-,root,root) %defattr(-,root,root)
#%ghost /usr/lib/tabset #%ghost %{_prefix}/lib/tabset
#%ghost /usr/lib/terminfo #%ghost %{_prefix}/lib/terminfo
%dir /usr/share/tabset/ %dir %{_datadir}/tabset/
%dir /usr/share/terminfo/ %dir %{_datadir}/terminfo/
%dir /usr/share/terminfo/*/ %dir %{_datadir}/terminfo/*/
/etc/termcap %{_sysconfdir}/termcap
%config /usr/share/misc/termcap %config %{_miscdir}/termcap
/%{_lib}/lib*.so.* /%{_lib}/lib*.so.*
/usr/bin/clear %{_bindir}/clear
/usr/bin/reset %{_bindir}/reset
/usr/bin/toe %{_bindir}/toe
/usr/bin/tput %{_bindir}/tput
/usr/bin/tset %{_bindir}/tset
/usr/%{_lib}/lib*.so.* %{_libdir}/lib*.so.*
%doc %{_mandir}/man1/clear.1.gz %doc %{_mandir}/man1/clear.1.gz
%doc %{_mandir}/man1/reset.1.gz %doc %{_mandir}/man1/reset.1.gz
%doc %{_mandir}/man1/toe.1.gz %doc %{_mandir}/man1/toe.1.gz
@ -357,14 +366,18 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_defaultdocdir}/ncurses/ %dir %{_defaultdocdir}/ncurses/
%doc %{_defaultdocdir}/ncurses/* %doc %{_defaultdocdir}/ncurses/*
/usr/bin/ncurses*-config %{_bindir}/ncurses*-config
/usr/bin/captoinfo %{_bindir}/captoinfo
/usr/bin/infocmp %{_bindir}/infocmp
/usr/bin/infotocap %{_bindir}/infotocap
/usr/bin/tic %{_bindir}/tic
/usr/include/*.h %dir %{_incdir}/ncurses/
/usr/%{_lib}/lib*.a %dir %{_incdir}/ncursesw/
/usr/%{_lib}/lib*.so %{_incdir}/*.h
%{_incdir}/ncurses/*.h
%{_incdir}/ncursesw/*.h
%{_libdir}/lib*.a
%{_libdir}/lib*.so
%doc %{_mandir}/man1/captoinfo.1.gz %doc %{_mandir}/man1/captoinfo.1.gz
%doc %{_mandir}/man1/infocmp.1.gz %doc %{_mandir}/man1/infocmp.1.gz
%doc %{_mandir}/man1/infotocap.1.gz %doc %{_mandir}/man1/infotocap.1.gz
@ -374,13 +387,18 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
%files -n tack %files -n tack
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/tack %{_bindir}/tack
%doc %{_mandir}/man1/tack.1.gz %doc %{_mandir}/man1/tack.1.gz
%files -f extension.list -n terminfo %files -f extension.list -n terminfo
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Wed Dec 05 2007 - werner@suse.de
- Add compatibility header files (bug #337412)
* Mon Oct 29 2007 - pth@suse.de
- Fix configure so that ncurses-config doesn't erroneously
report ncurses.h to reside in /usr/include/ncurses (#337412).
* Wed Sep 05 2007 - werner@suse.de * Wed Sep 05 2007 - werner@suse.de
- Move libncursesw to /lib or /lib64 (bug #307353) - Move libncursesw to /lib or /lib64 (bug #307353)
* Fri May 25 2007 - dmueller@suse.de * Fri May 25 2007 - dmueller@suse.de