rpms/ncurses
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update to patch 20120204

Browse Source
This commit is contained in:
Miroslav Lichvar 2012-02-08 14:49:11 +01:00
parent e22355ab3f
commit 1687a9a4c1
5 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,2 +1,3 @@
/ncurses-5.9.tar.gz /ncurses-5.9.tar.gz
/ncurses-5.9-20110409-20110716.patch.bz2 /ncurses-5.9-20111224-patch.sh.bz2
/ncurses-5.9-20111231-20120204.patch.bz2

27
ncurses-libs.patch
View File

@ -1,33 +1,36 @@
--- ncurses-5.6/menu/Makefile.in.libs 2007-06-13 15:01:12.000000000 +0200 diff -up ncurses-5.9/form/Makefile.in.libs ncurses-5.9/form/Makefile.in
+++ ncurses-5.6/menu/Makefile.in 2007-06-13 15:01:13.000000000 +0200 --- ncurses-5.9/form/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100
@@ -95,7 +95,7 @@ LINK = $(LIBTOOL_LINK) +++ ncurses-5.9/form/Makefile.in 2012-02-07 18:26:45.915065925 +0100
@@ -100,7 +100,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@ MK_SHARED_LIB = @MK_SHARED_LIB@
diff -up ncurses-5.9/menu/Makefile.in.libs ncurses-5.9/menu/Makefile.in
--- ncurses-5.6/panel/Makefile.in.libs 2007-06-13 15:01:12.000000000 +0200 --- ncurses-5.9/menu/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100
+++ ncurses-5.6/panel/Makefile.in 2007-06-13 15:01:13.000000000 +0200 +++ ncurses-5.9/menu/Makefile.in 2012-02-07 18:26:03.251063857 +0100
@@ -96,7 +96,7 @@ LINK = $(LIBTOOL_LINK) @@ -100,7 +100,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@ MK_SHARED_LIB = @MK_SHARED_LIB@
diff -up ncurses-5.9/panel/Makefile.in.libs ncurses-5.9/panel/Makefile.in
--- ncurses-5.6/form/Makefile.in.libs 2007-06-13 15:01:12.000000000 +0200 --- ncurses-5.9/panel/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100
+++ ncurses-5.6/form/Makefile.in 2007-06-13 15:01:13.000000000 +0200 +++ ncurses-5.9/panel/Makefile.in 2012-02-07 18:26:28.798065062 +0100
@@ -95,7 +95,7 @@ LINK = $(LIBTOOL_LINK) @@ -101,7 +101,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@ MK_SHARED_LIB = @MK_SHARED_LIB@

8
ncurses-urxvt.patch
View File

@ -1,7 +1,7 @@
diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src
--- ncurses-5.9/misc/terminfo.src.urxvt 2011-07-18 16:24:45.304407369 +0200 --- ncurses-5.9/misc/terminfo.src.urxvt 2012-02-07 18:28:00.000000000 +0100
+++ ncurses-5.9/misc/terminfo.src 2011-07-18 16:26:27.854562083 +0200 +++ ncurses-5.9/misc/terminfo.src 2012-02-07 18:28:50.650076519 +0100
@@ -4243,6 +4243,173 @@ rxvt-cygwin-native|rxvt terminal emulato @@ -4417,6 +4417,173 @@ rxvt-cygwin-native|rxvt terminal emulato
rxvt-16color|xterm with 16 colors like aixterm, rxvt-16color|xterm with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt, ncv#32, use=ibm+16color, use=rxvt,
@ -172,6 +172,6 @@ diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src
+ fsl=\007, + fsl=\007,
+ dsl=\E]2;\007, + dsl=\E]2;\007,
+ +
#### MRXVT
# mrxvt 0.5.4 # mrxvt 0.5.4
# #
# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which

7
ncurses.spec
View File

@ -7,7 +7,8 @@ Group: System Environment/Base
URL: http://invisible-island.net/ncurses/ncurses.html URL: http://invisible-island.net/ncurses/ncurses.html
Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
Patch1: ncurses-5.9-20110409-20110716.patch.bz2 Patch1: ncurses-5.9-20111224-patch.sh.bz2
Patch2: ncurses-5.9-20111231-20120204.patch.bz2
Patch8: ncurses-config.patch Patch8: ncurses-config.patch
Patch9: ncurses-libs.patch Patch9: ncurses-libs.patch
Patch11: ncurses-urxvt.patch Patch11: ncurses-urxvt.patch
@ -91,6 +92,7 @@ The ncurses-static package includes static libraries of the ncurses library.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch8 -p1 -b .config %patch8 -p1 -b .config
%patch9 -p1 -b .libs %patch9 -p1 -b .libs
@ -114,11 +116,10 @@ done
--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
--enable-overwrite \\\ --enable-overwrite \\\
--enable-pc-files \\\ --enable-pc-files \\\
--with-pkg-config-libdir=%{_libdir}/pkgconfig \\\
--with-termlib=tinfo \\\ --with-termlib=tinfo \\\
--with-chtype=long --with-chtype=long
export PKG_CONFIG_LIBDIR=%{_libdir}/pkgconfig
mkdir narrowc widec mkdir narrowc widec
cd narrowc cd narrowc
ln -s ../configure . ln -s ../configure .

3
sources
View File

@ -1,2 +1,3 @@
8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz 8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz
68d3169181b0e526f16367a6d5333a39 ncurses-5.9-20110409-20110716.patch.bz2 3138ed61b6290f201f3456ddc2dc8e38 ncurses-5.9-20111224-patch.sh.bz2
801567a454758ced0e1c7adc7bf58b9a ncurses-5.9-20111231-20120204.patch.bz2