Author: gotar Date: Fri Dec 25 19:04:08 2009 GMT Module: packages Tag: HEAD ---- Log message: - upgraded to final 4.7.0; - conditional blocker, - rpm wrapper totally rewritten: e7ed071be7fda2df59191d103c47bf30a6b98ca8 - drop srpm VFS, rpm used instead: d53630b8001beea487e6053c7223e30b4bbff94b
---- Files affected: packages/mc: mc.spec (1.303 -> 1.304) ---- Diffs: ================================================================ Index: packages/mc/mc.spec diff -u packages/mc/mc.spec:1.303 packages/mc/mc.spec:1.304 --- packages/mc/mc.spec:1.303 Mon Dec 14 22:50:51 2009 +++ packages/mc/mc.spec Fri Dec 25 20:04:03 2009 @@ -8,8 +8,8 @@ %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 blocker # it's not a bug, it's a feature # -%define snap pre4 Summary: A user-friendly file manager and visual shell Summary(de.UTF-8): Visuelle Shell Midnight Commander Summary(es.UTF-8): Interpretador de comandos visual Midnight Commander @@ -23,11 +23,11 @@ Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell Name: mc Version: 4.7.0 -Release: 0.9 +Release: 1 License: GPL v2+ Group: Applications/Shells -Source0: http://www.midnight-commander.org/downloads/%{name}-%{version}-%{snap}.tar.bz2 -# Source0-md5: 7bdc0ac4fe57c19a6bf2fd3e8894a073 +Source0: http://www.midnight-commander.org/downloads/%{name}-%{version}.tar.bz2 +# Source0-md5: fbb8c47179b8fd40104e4d52aeb49659 Source1: %{name}serv.pamd Source2: %{name}serv.init Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 @@ -46,7 +46,7 @@ Patch17: %{name}-nolibs.patch Patch24: %{name}-find_options.patch URL: http://www.midnight-commander.org/ -BuildRequires: It's broken, see changelog! +%{?with_blocker:BuildRequires: rpmbuild_blocker} BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel @@ -220,10 +220,10 @@ тільки власне Midnight Commander). %prep -%setup -q -a3 -n %{name}-%{version}-%{snap} -%patch0 -p1 +%setup -q -a3 -n %{name}-%{version} +#rpm wrapper rewritten +#%patch0 -p1 %patch1 -p1 -cp -f vfs/extfs/{rpm,srpm} # doesn't apply #%patch4 -p1 # doesn't apply @@ -384,7 +384,6 @@ %attr(755,root,root) %{_datadir}/mc/extfs/ulha %attr(755,root,root) %{_datadir}/mc/extfs/urar %attr(755,root,root) %{_datadir}/mc/extfs/uzoo -%attr(755,root,root) %{_datadir}/mc/extfs/srpm %{_desktopdir}/mc.desktop %{_pixmapsdir}/mc.png @@ -419,6 +418,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.304 2009/12/25 19:04:03 gotar +- upgraded to final 4.7.0; +- conditional blocker, +- rpm wrapper totally rewritten: e7ed071be7fda2df59191d103c47bf30a6b98ca8 +- drop srpm VFS, rpm used instead: d53630b8001beea487e6053c7223e30b4bbff94b + Revision 1.303 2009/12/14 21:50:51 baggins - builder-blocker, really ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.303&r2=1.304&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
