- update to patch 20100703
- add README to base subpackage
This commit is contained in:
Miroslav Lichvar
parent
cf8904c46b
commit
dd60f37fa4
@ -1,3 +1,3 @@
|
||||
ncurses-5.7.tar.gz
|
||||
ncurses-5.7-20091107-patch.sh.bz2
|
||||
ncurses-5.7-20091114-20100130.patch.bz2
|
||||
ncurses-5.7-20100424-patch.sh.bz2
|
||||
ncurses-5.7-20100501-20100703.patch.bz2
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
diff -up ncurses-5.7/misc/gen-pkgconfig.in.config ncurses-5.7/misc/gen-pkgconfig.in
|
||||
--- ncurses-5.7/misc/gen-pkgconfig.in.config 2010-02-03 18:02:14.000000000 +0100
|
||||
+++ ncurses-5.7/misc/gen-pkgconfig.in 2010-02-03 18:19:42.000000000 +0100
|
||||
@@ -44,6 +44,7 @@ MENU_NAME=menu # @MENU_NAME@
|
||||
FORM_NAME=form # @FORM_NAME@
|
||||
CXX_NAME=ncurses++ # @CXX_NAME@
|
||||
DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
|
||||
+TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
|
||||
CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
|
||||
|
||||
prefix="@prefix@"
|
||||
@@ -57,16 +58,14 @@ show_includedir='@includedir@'
|
||||
show_libdir='@libdir@'
|
||||
|
||||
MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
|
||||
-SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
|
||||
+SUB_LIBRARY="${TINFO_ARG_SUFFIX}"
|
||||
PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
|
||||
MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
|
||||
FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
|
||||
|
||||
SUB_LIBRARY_REQ=${SUB_LIBRARY}
|
||||
-TINFO_NAME_REQ=${TINFO_NAME}
|
||||
if test $TINFO_NAME = $LIB_NAME ; then
|
||||
SUB_LIBRARY_REQ=
|
||||
- TINFO_NAME_REQ=
|
||||
fi
|
||||
|
||||
for lib in ../lib/*
|
||||
@@ -88,7 +87,7 @@ do
|
||||
|
||||
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
|
||||
if test $name = $MAIN_LIBRARY ; then
|
||||
- reqs=$TINFO_NAME_REQ
|
||||
+ reqs=$SUB_LIBRARY_REQ
|
||||
desc="$desc library"
|
||||
elif test $name = $SUB_LIBRARY ; then
|
||||
reqs=
|
||||
diff -up ncurses-5.7/misc/ncurses-config.in.config ncurses-5.7/misc/ncurses-config.in
|
||||
--- ncurses-5.7/misc/ncurses-config.in.config 2010-01-18 14:35:20.000000000 +0100
|
||||
+++ ncurses-5.7/misc/ncurses-config.in 2010-01-18 14:37:01.000000000 +0100
|
||||
@@ -35,12 +35,11 @@ exec_prefix="@exec_prefix@"
|
||||
|
||||
bindir="@bindir@"
|
||||
includedir="@includedir@"
|
||||
-libdir="@libdir@"
|
||||
datadir="@datadir@"
|
||||
mandir="@mandir@"
|
||||
|
||||
THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
|
||||
-TINFO_LIB="@TINFO_NAME@@DFT_ARG_SUFFIX@"
|
||||
+TINFO_LIB="@TINFO_ARG_SUFFIX@"
|
||||
|
||||
LANG=C; export LANG
|
||||
LANGUAGE=C; export LANGUAGE
|
||||
@@ -85,11 +84,11 @@ ENDECHO
|
||||
--libs)
|
||||
if test @TINFO_NAME@ = @LIB_NAME@ ; then
|
||||
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
|
||||
- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
|
||||
+ @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
|
||||
ENDECHO
|
||||
else
|
||||
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
|
||||
- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
|
||||
+ @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
|
||||
ENDECHO
|
||||
fi
|
||||
;;
|
||||
@@ -114,7 +113,6 @@ ENDECHO
|
||||
echo "${includedir}"
|
||||
;;
|
||||
--libdir)
|
||||
- echo "${libdir}"
|
||||
;;
|
||||
--mandir)
|
||||
echo "${mandir}"
|
||||
33
ncurses-5.7-20100703-config.patch
Normal file
33
ncurses-5.7-20100703-config.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff -up ncurses-5.7/misc/ncurses-config.in.config ncurses-5.7/misc/ncurses-config.in
|
||||
--- ncurses-5.7/misc/ncurses-config.in.config 2010-07-13 16:55:47.000000000 +0200
|
||||
+++ ncurses-5.7/misc/ncurses-config.in 2010-07-13 16:59:07.000000000 +0200
|
||||
@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@"
|
||||
|
||||
bindir="@bindir@"
|
||||
includedir="@includedir@"
|
||||
-libdir="@libdir@"
|
||||
datadir="@datadir@"
|
||||
mandir="@mandir@"
|
||||
|
||||
@@ -85,11 +84,11 @@ ENDECHO
|
||||
--libs)
|
||||
if test @TINFO_NAME@ = @LIB_NAME@ ; then
|
||||
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
|
||||
- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
|
||||
+ @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
|
||||
ENDECHO
|
||||
else
|
||||
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
|
||||
- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
|
||||
+ @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
|
||||
ENDECHO
|
||||
fi
|
||||
;;
|
||||
@@ -114,7 +113,6 @@ ENDECHO
|
||||
echo "${includedir}"
|
||||
;;
|
||||
--libdir)
|
||||
- echo "${libdir}"
|
||||
;;
|
||||
--mandir)
|
||||
echo "${mandir}"
|
||||
@ -1,7 +1,7 @@
|
||||
diff -up ncurses-5.6/misc/terminfo.src.urxvt ncurses-5.6/misc/terminfo.src
|
||||
--- ncurses-5.6/misc/terminfo.src.urxvt 2008-01-10 14:09:13.000000000 +0100
|
||||
+++ ncurses-5.6/misc/terminfo.src 2008-01-10 14:13:17.000000000 +0100
|
||||
@@ -3882,6 +3882,172 @@ rxvt-cygwin-native|rxvt terminal emulato
|
||||
diff -up ncurses-5.7/misc/terminfo.src.urxvt ncurses-5.7/misc/terminfo.src
|
||||
--- ncurses-5.7/misc/terminfo.src.urxvt 2010-07-13 17:32:48.000000000 +0200
|
||||
+++ ncurses-5.7/misc/terminfo.src 2010-07-13 17:32:48.000000000 +0200
|
||||
@@ -4184,6 +4184,172 @@ rxvt-cygwin-native|rxvt terminal emulato
|
||||
rxvt-16color|xterm with 16 colors like aixterm,
|
||||
ncv#32, use=ibm+16color, use=rxvt,
|
||||
|
||||
@ -171,6 +171,6 @@ diff -up ncurses-5.6/misc/terminfo.src.urxvt ncurses-5.6/misc/terminfo.src
|
||||
+ fsl=\007,
|
||||
+ dsl=\E]2;\007,
|
||||
+
|
||||
# mrxvt 0.5.3
|
||||
# mrxvt 0.5.4
|
||||
#
|
||||
# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
|
||||
22
ncurses.spec
22
ncurses.spec
@ -1,22 +1,24 @@
|
||||
Summary: Ncurses support utilities
|
||||
Name: ncurses
|
||||
Version: 5.7
|
||||
Release: 7.20100130%{?dist}
|
||||
Release: 8.20100703%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Base
|
||||
URL: http://invisible-island.net/ncurses/ncurses.html
|
||||
Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
|
||||
|
||||
Patch1: ncurses-5.7-20091107-patch.sh.bz2
|
||||
Patch2: ncurses-5.7-20091114-20100130.patch.bz2
|
||||
Patch1: ncurses-5.7-20100424-patch.sh.bz2
|
||||
Patch2: ncurses-5.7-20100501-20100703.patch.bz2
|
||||
|
||||
Patch8: ncurses-5.7-20100116-config.patch
|
||||
Patch8: ncurses-5.7-20100703-config.patch
|
||||
Patch9: ncurses-5.6-20070612-libs.patch
|
||||
Patch11: ncurses-5.6-20080112-urxvt.patch
|
||||
Patch11: ncurses-5.7-20100703-urxvt.patch
|
||||
Patch12: ncurses-5.6-20080628-kbs.patch
|
||||
BuildRequires: gpm-devel pkgconfig
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The curses library routines are a terminal-independent method of
|
||||
updating character screens with reasonable optimization. The ncurses
|
||||
@ -177,7 +179,7 @@ done
|
||||
for termname in \
|
||||
Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
|
||||
konsole konsole-256color mach\* mlterm mrxvt nsterm putty\* pcansi \
|
||||
rxvt rxvt-\* screen screen-\* screen.\* sun teraterm teraterm2.3 \
|
||||
rxvt rxvt-\* screen screen-\*color screen.\* sun teraterm teraterm2.3 \
|
||||
vwmterm wsvt25\* xfce xterm xterm-\*
|
||||
do
|
||||
for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
|
||||
@ -230,7 +232,7 @@ bzip2 NEWS
|
||||
%defattr(-,root,root)
|
||||
%doc ANNOUNCE AUTHORS NEWS.bz2 README TO-DO
|
||||
%{_bindir}/[cirt]*
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man1/[cirt]*
|
||||
%{_mandir}/man5/*
|
||||
%{_mandir}/man7/*
|
||||
|
||||
@ -241,6 +243,7 @@ bzip2 NEWS
|
||||
|
||||
%files base -f terms.base
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%dir %{_sysconfdir}/terminfo
|
||||
%{rootdatadir}/terminfo
|
||||
%{_datadir}/tabset
|
||||
@ -264,6 +267,7 @@ bzip2 NEWS
|
||||
%{_includedir}/ncurses/*.h
|
||||
%{_includedir}/ncursesw/*.h
|
||||
%{_includedir}/*.h
|
||||
%{_mandir}/man1/ncurses*-config*
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files static
|
||||
@ -274,6 +278,10 @@ bzip2 NEWS
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%changelog
|
||||
* Wed Jul 14 2010 Miroslav Lichvar <mlichvar@redhat.com> 5.7-8.20100703
|
||||
- update to patch 20100703
|
||||
- add README to base subpackage
|
||||
|
||||
* Wed Feb 03 2010 Miroslav Lichvar <mlichvar@redhat.com> 5.7-7.20100130
|
||||
- update to patch 20100130
|
||||
- fix ncursesw5-config and pc files to use correct tinfo
|
||||
|
||||
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
cce05daf61a64501ef6cd8da1f727ec6 ncurses-5.7.tar.gz
|
||||
7c840a1fa324d4e971414ae647600fc9 ncurses-5.7-20091107-patch.sh.bz2
|
||||
65ceeb747e4ff5be824e8f32193a54e4 ncurses-5.7-20091114-20100130.patch.bz2
|
||||
3a5f76613f0f7ec3e0e73b835bc24864 ncurses-5.7-20100424-patch.sh.bz2
|
||||
4b0c5f399843304e8cabcab1ec6012cf ncurses-5.7-20100501-20100703.patch.bz2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user