From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 26 Aug 2010 21:09:15 +0000 (+0000)
Subject: - add -ltinfow patch; rel 3
X-Git-Tag: auto/th/moc-2_4_4-3
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmoc.git;a=commitdiff_plain;h=a0f6fa218aea14d0f0bb4ee2f4b757f86de865e2

- add -ltinfow patch; rel 3

Changed files:
    moc.spec -> 1.50
    ncurses-tinfo.patch -> 1.1
---

diff --git a/moc.spec b/moc.spec
index 208e091..03674d0 100644
--- a/moc.spec
+++ b/moc.spec
@@ -7,12 +7,13 @@ Summary(hu.UTF-8):	Konzolos audiólejátszó egyszerű ncurses felülettel
 Summary(pl.UTF-8):	Konsolowy odtwarzacz audio z prostym interfejsem ncurses
 Name:		moc
 Version:	2.4.4
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/Sound
 Source0:	ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
 # Source0-md5:	647c770a5542a4ae5437386807a89796
 Patch0:		%{name}-home_etc.patch
+Patch1:		ncurses-tinfo.patch
 URL:		http://moc.daper.net/
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel
@@ -205,6 +206,7 @@ należy uruchomić ponownie MOC.
 %prep
 %setup -q
 %{?with_home_etc:%patch0 -p1}
+%patch1 -p1
 
 
 rm -rf libltdl
diff --git a/ncurses-tinfo.patch b/ncurses-tinfo.patch
new file mode 100644
index 0000000..f9ee9ee
--- /dev/null
+++ b/ncurses-tinfo.patch
@@ -0,0 +1,36 @@
+--- moc-2.4.4/m4/mp_with_curses.m4~	2006-02-12 13:55:08.000000000 +0200
++++ moc-2.4.4/m4/mp_with_curses.m4	2010-08-27 00:08:09.671905405 +0300
+@@ -38,7 +38,7 @@
+ 	     	[Define if you have ncursesw.h]))
+ 	     AC_DEFINE(HAVE_NCURSES_H, 1, [Define if you have ncursesw/curses.h])
+ 	     AC_DEFINE(HAVE_NCURSESW, 1, [Define if you have libncursesw])
+-	     CURSES_LIB="-lncursesw"
++	     CURSES_LIB="-lncursesw -ltinfow"
+ 	   fi
+    fi
+  
+@@ -53,13 +53,13 @@
+      if test "$mp_cv_curses" = yes
+      then
+        AC_DEFINE(HAVE_CURSES_H, 1, [Define if you have curses.h])
+-       CURSES_LIB="-lcurses"
++       CURSES_LIB="-lcurses -ltinfo"
+      fi
+    fi
+    if test ! "$CURSES_LIB"
+    then
+      AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses,
+-       [LIBS="$mp_save_LIBS -lncurses"
++       [LIBS="$mp_save_LIBS -lncurses -ltinfo"
+         AC_TRY_LINK(
+           [#include <ncurses.h>],
+           [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
+@@ -67,7 +67,7 @@
+      if test "$mp_cv_ncurses" = yes
+      then
+        AC_DEFINE(HAVE_NCURSES_H, 1, [Define if you have ncurses.h])
+-       CURSES_LIB="-lncurses"
++       CURSES_LIB="-lncurses -ltinfo"
+      fi
+    fi
+    LIBS="$mp_save_LIBS"