Author: witekfl Date: Fri Sep 25 18:46:10 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- added bcond with_ncursesw (mc-4.7.0 crashed on startup because
of different sonames of libtinfo and libncursesw)
---- Files affected:
packages/gpm:
gpm.spec (1.161 -> 1.162) , gpm-ncursesw.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gpm/gpm.spec
diff -u packages/gpm/gpm.spec:1.161 packages/gpm/gpm.spec:1.162
--- packages/gpm/gpm.spec:1.161 Tue Feb 10 00:48:57 2009
+++ packages/gpm/gpm.spec Fri Sep 25 20:46:05 2009
@@ -3,6 +3,7 @@
# TODO:
# - make modprobe of kernel mouse modules for 2.5
#
+%bcond_with ncursesw # for mc-4.7.0
Summary: General Purpose Mouse support for Linux
Summary(de.UTF-8): Allgemeine Mausunterstützung für Linux
Summary(es.UTF-8): Soporte para ratón en terminales modo texto
@@ -15,7 +16,7 @@
Summary(uk.UTF-8): Сервер роботи з мишою для консолі Linux
Name: gpm
Version: 1.20.6
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2+
Group: Daemons
@@ -30,6 +31,7 @@
Patch2: %{name}-gawk.patch
Patch3: %{name}-nodebug.patch
Patch4: %{name}-dont_display_stupid_error_messages.patch
+Patch5: %{name}-ncursesw.patch
URL: http://linux.schottelius.org/gpm/
BuildRequires: autoconf
BuildRequires: automake
@@ -227,13 +229,16 @@
%patch2 -p1
%{!?debug:%patch3 -p1}
%patch4 -p1
+%if %{with ncursesw}
+%patch5 -p1
+%endif
sed -i -e 's#/usr##' doc/manpager
%build
%{__aclocal}
%{__autoconf}
-%configure \
+%configure %{?with_ncursesw:CPPFLAGS="%{rpmcppflags} -I/usr/include/ncursesw"} \
--with-curses
%{__make} \
@@ -333,6 +338,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.162 2009/09/25 18:46:05 witekfl
+- added bcond with_ncursesw (mc-4.7.0 crashed on startup because
+of different sonames of libtinfo and libncursesw)
+
Revision 1.161 2009/02/09 23:48:57 adamg
- updated to 1.20.6
================================================================
Index: packages/gpm/gpm-ncursesw.patch
diff -u /dev/null packages/gpm/gpm-ncursesw.patch:1.1
--- /dev/null Fri Sep 25 20:46:11 2009
+++ packages/gpm/gpm-ncursesw.patch Fri Sep 25 20:46:05 2009
@@ -0,0 +1,19 @@
+--- gpm-1.20.6/configure.ac.old 2009-09-25 20:21:34.000000000 +0200
++++ gpm-1.20.6/configure.ac 2009-09-25 20:24:05.000000000 +0200
+@@ -113,14 +113,14 @@
+ *)
+ SAVELIBS=$LIBS
+ LIBS=
+- for i in tinfo ncurses termcap termlib; do
++ for i in tinfow ncursesw termcap termlib; do
+ if test x$LIBS = x; then
+ AC_CHECK_LIB($i, tputs)
+ else :; fi
+ done
+ TERMLIBS=$LIBS
+ LIBS=
+- for i in ncurses curses; do
++ for i in ncursesw curses; do
+ if test x$LIBS = x; then
+ AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
+ else :; fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpm/gpm.spec?r1=1.161&r2=1.162&f=u