- no more separated libtinfo(w)

Changed files:
    moc.spec -> 1.61
    ncurses-tinfo.patch -> 1.2

diff --git a/moc.spec b/moc.spec
index 1a9d8c330390a0f9dd1d46fd5a4fbb88b4f04ac3..bc96502a8f9647290675f2cd314ca513593af319 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -14,8 +14,7 @@ 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
-Patch2:                ffmpeg071.patch
+Patch1:                ffmpeg071.patch
 URL:           http://moc.daper.net/
 BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel
@@ -208,8 +207,7 @@ należy uruchomić ponownie MOC.
 %prep
 %setup -q
 %{?with_home_etc:%patch0 -p1}
-%patch1 -p1
-%patch2 -p2
+%patch1 -p2
 
 rm -rf libltdl
 %{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am

diff --git a/ncurses-tinfo.patch b/ncurses-tinfo.patch
deleted file mode 100644 (file)
index f9ee9ee..0000000
--- a/ncurses-tinfo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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"