SPECS: moc.spec

[Maciek Mitura]

Witam.
Zaktualizowałem moc.spec. Aktualizacji wymaga również moc-ncurses.patch,
który teraz jest zupełnie inny.
Podsyłam poprawki na:
SOURCES: moc-ncurses.patch
SPECS: moc.spec

-- 
Pozdrawiam
Maciek Mitura
gg: 915150 | jid: mitek[at]chrome.pl
-------------- następna część ---------
--- moc.spec	2005-05-06 15:08:45.000000000 +0200
+++ moc-mitek.spec	2005-05-06 15:00:49.000000000 +0200
@@ -4,12 +4,12 @@
 Summary:	Console audio player with simple ncurses interface
 Summary(pl):	Konsolowy odtwarzacz audio z prostym interfejsem ncurses
 Name:		moc
-Version:	2.2.0
+Version:	2.2.1
 Release:	1
 License:	GPL
 Group:		Applications/Sound
 Source0:	ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.gz
-# Source0-md5:	992f64aee3a2bba83ee15b834bd796fb
+# Source0-md5:	6288d3de8048bc9a3bb2e484075c86e9
 Patch0:		%{name}-ncurses.patch
 URL:		http://moc.daper.net/
 BuildRequires:	autoconf
@@ -48,7 +48,8 @@
 %{__automake}
 %configure \
  	--disable-version-checker \
-	--disable-debug
+	--disable-debug \
+	--with-ncurses
 
 %{__make}
 
-------------- następna część ---------
--- moc-ncurses.patch	2003-02-03 22:22:54.000000000 +0100
+++ moc-ncurses-mitek.patch	2005-05-06 13:39:40.000000000 +0200
@@ -1,14 +1,42 @@
-diff -ur moc-1.1.0-orig/configure.in moc-1.1.0/configure.in
---- moc-1.1.0-orig/configure.in	Tue Dec  3 18:25:40 2002
-+++ moc-1.1.0/configure.in	Mon Feb  3 22:14:31 2003
-@@ -47,8 +47,8 @@
- 
- dnl ncurses
- AC_CHECK_LIB(ncurses, initscr, [
--	AC_CHECK_HEADER([ncurses.h],, [
--		AC_MSG_ERROR([You nedd ncurses header file.])])
-+	AC_CHECK_HEADER([ncurses/ncurses.h],, [
-+		AC_MSG_ERROR([You need ncurses header file.])])
- 	],
- 	[AC_MSG_ERROR([You need ncurses library.])]
- )
+diff -urN moc-2.2.1/configure moc-2.2.1-mitek/configure
+--- moc-2.2.1/configure	2005-04-15 23:08:32.000000000 +0200
++++ moc-2.2.1-mitek/configure	2005-05-06 13:38:17.000000000 +0200
+@@ -7429,7 +7429,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <curses.h>
++#include <ncurses/curses.h>
+ int
+ main ()
+ {
+@@ -7496,7 +7496,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <ncurses.h>
++#include <ncurses/ncurses.h>
+ int
+ main ()
+ {
+diff -urN moc-2.2.1/m4/mp_with_curses.m4 moc-2.2.1-mitek/m4/mp_with_curses.m4
+--- moc-2.2.1/m4/mp_with_curses.m4	2005-04-08 14:32:16.000000000 +0200
++++ moc-2.2.1-mitek/m4/mp_with_curses.m4	2005-05-06 13:38:37.000000000 +0200
+@@ -22,7 +22,7 @@
+      AC_CACHE_CHECK([for working curses], mp_cv_curses,
+        [LIBS="$LIBS -lcurses"
+         AC_TRY_LINK(
+-          [#include <curses.h>],
++          [#include <ncurses/curses.h>],
+           [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
+           mp_cv_curses=yes, mp_cv_curses=no)])
+      if test "$mp_cv_curses" = yes
+@@ -36,7 +36,7 @@
+      AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses,
+        [LIBS="$mp_save_LIBS -lncurses"
+         AC_TRY_LINK(
+-          [#include <ncurses.h>],
++          [#include <ncurses/ncurses.h>],
+           [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
+           mp_cv_ncurses=yes, mp_cv_ncurses=no)])
+      if test "$mp_cv_ncurses" = yes