SPECS (AC-branch): mol.spec - AC version: no iquote patch, ncurses...

[sparky]

Author: sparky                       Date: Thu Nov 16 21:37:20 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- AC version: no iquote patch, ncurses hack, BR: XFree86-devel

---- Files affected:
SPECS:
   mol.spec (1.42 -> 1.42.2.1) 

---- Diffs:

================================================================
Index: SPECS/mol.spec
diff -u SPECS/mol.spec:1.42 SPECS/mol.spec:1.42.2.1
--- SPECS/mol.spec:1.42	Thu Nov 16 22:20:55 2006
+++ SPECS/mol.spec	Thu Nov 16 22:37:14 2006
@@ -28,19 +28,17 @@
 #Source0:	http://www.maconlinux.org/downloads/%{name}-%{version}.tgz
 Source0:	http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/%{name}-%{version}.tar.bz2
 # Source0-md5:	3eaa51927191b03b06828609a1122307
-Patch0:		%{name}-iquote.patch
-Patch1:		%{name}-scripts.patch
+Patch0:		%{name}-scripts.patch
 URL:		http://www.maconlinux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %if %{with userspace}
-BuildRequires:	gcc >= 4.0
 %if !%{with minimal}
+BuildRequires:	XFree86-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libpng-devel
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXext-devel
 %endif
+BuildRequires:	sed >= 4.0
 %{?with_debugger:BuildRequires:	ncurses-devel}
 %endif
 %if %{with kernel}
@@ -110,7 +108,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 echo 'obj-m := sheep.o' > src/netdriver/Makefile.26
 sed -i 's@ \./configure @ true @' config/Makefile.master
 
@@ -176,6 +173,7 @@
 %{__make} defconfig
 
 %if %{with userspace}
+sed 's/<curses.h>/"curses.h"/' -i src/debugger/deb/{cmdline.c,monitor.c}
 %{__make} \
 	NCURSES_INCLUDES="-I/usr/include/ncurses" \
 	prefix=%{_prefix} \
@@ -284,6 +282,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.1  2006/11/16 21:37:14  sparky
+- AC version: no iquote patch, ncurses hack, BR: XFree86-devel
+
 Revision 1.42  2006/11/16 21:20:55  sparky
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mol.spec?r1=1.42&r2=1.42.2.1&f=u