Author: arekm                        Date: Mon Dec 28 12:10:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop blocker; there is mc46.spec (unfinished aka copy from mc.spec) if you 
need 4.6 version

---- Files affected:
packages/mc:
   mc.spec (1.306 -> 1.307) 

---- Diffs:

================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.306 packages/mc/mc.spec:1.307
--- packages/mc/mc.spec:1.306   Sat Dec 26 19:18:43 2009
+++ packages/mc/mc.spec Mon Dec 28 13:10:24 2009
@@ -8,7 +8,6 @@
 %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_without blocker         # it's not a bug, it's a feature
 #
 Summary:       A user-friendly file manager and visual shell
 Summary(de.UTF-8):     Visuelle Shell Midnight Commander
@@ -47,7 +46,6 @@
 Patch17:       %{name}-nolibs.patch
 Patch24:       %{name}-find_options.patch
 URL:           http://www.midnight-commander.org/
-%{?with_blocker:BuildRequires: rpmbuild_blocker}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -78,6 +76,7 @@
 Suggests:      tar
 Suggests:      unzip
 Obsoletes:     tkmc
+Obsoletes:     mc46
 Conflicts:     bash < 2.05b
 Conflicts:     rpm < 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -163,6 +162,7 @@
 Requires:      pam >= 0.99.7.1-1
 Requires:      portmap
 Requires:      rc-scripts >= 0.4.1.5
+Obsoletes:     mc46serv
 
 %description -n mcserv
 The Midnight Commander file management system will allow you to
@@ -431,6 +431,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.307  2009/12/28 12:10:24  arekm
+- drop blocker; there is mc46.spec (unfinished aka copy from mc.spec) if you 
need 4.6 version
+
 Revision 1.306  2009/12/26 18:18:43  uzsolt
 - hu summary and description
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.306&r2=1.307&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to