SPECS: mc.spec - slang2 support; utf8 enabled by default

[arekm]

Author: arekm                        Date: Mon Sep 19 20:45:16 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- slang2 support; utf8 enabled by default

---- Files affected:
SPECS:
   mc.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: SPECS/mc.spec
diff -u SPECS/mc.spec:1.217 SPECS/mc.spec:1.218
--- SPECS/mc.spec:1.217	Sun Aug  7 11:56:15 2005
+++ SPECS/mc.spec	Mon Sep 19 22:45:11 2005
@@ -5,7 +5,7 @@
 %bcond_without	perl_vfs	# without perl depending vfs'es -- to avoid perl autoreq
 %bcond_with	samba		# with SAMBA vfs support
 %bcond_without	x		# without text edit in X support
-%bcond_with	utf8		# for now it's bcond (broken), in future include by DEFAULT (after updating patches)
+%bcond_without	utf8		# utf8
 #
 Summary:	A user-friendly file manager and visual shell
 Summary(de):	Visuelle Shell Midnight Commander
@@ -20,7 +20,7 @@
 Summary(zh_CN):	Ňť¸öˇ˝ąăĘľÓĂľÄÎÄźţšÜŔíĆ÷şÍĐéÄâShell
 Name:		mc
 Version:	4.6.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Shells
 Source0:	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/%{name}-%{version}.tar.gz
@@ -57,6 +57,7 @@
 # http://www.suse.de/~nadvornik/mc.html
 Patch13:	http://www.ottolander.nl/mc-patches/UTF-8/mc-4.6.1-utf8.patch
 Patch17:	%{name}-nolibs.patch
+Patch18:	%{name}-slang2.patch
 URL:		http://www.ibiblio.org/mc/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -68,8 +69,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-perlprov
 %if %{with utf8}
-BuildRequires:	slang-devel(utf8) >= 1:1.4.9-6
-Requires:	slang(utf8) >= 1:1.4.9-6
+BuildRequires:	slang-devel >= 2.0.0
 %endif
 %ifnarch s390 s390x
 BuildRequires:	gpm-devel
@@ -241,6 +241,7 @@
 %patch12 -p1
 %if %{with utf8}
 %patch13 -p1
+%patch18 -p1
 %endif
 %patch17 -p1
 
@@ -494,6 +495,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2005/09/19 20:45:11  arekm
+- slang2 support; utf8 enabled by default
+
 Revision 1.217  2005/08/07 09:56:15  pascalek
 - Release 1
 - updated pl patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mc.spec?r1=1.217&r2=1.218&f=u