Author: pawelz Date: Fri Feb 26 16:09:25 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- adapterized
---- Files affected:
packages/mc:
mc.spec (1.311 -> 1.312)
---- Diffs:
================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.311 packages/mc/mc.spec:1.312
--- packages/mc/mc.spec:1.311 Fri Feb 26 17:07:05 2010
+++ packages/mc/mc.spec Fri Feb 26 17:09:20 2010
@@ -60,9 +60,9 @@
%ifnarch s390 s390x
BuildRequires: gpm-devel
%endif
-# Needed? %%{?with_perl_vfs:Requires: perl-base}
-%{?with_x:BuildRequires: xorg-lib-libX11-devel}
%{?with_ext2undel:BuildRequires: e2fsprogs-devel}
+%{?with_x:BuildRequires: xorg-lib-libX11-devel}
+# Needed? %%{?with_perl_vfs:Requires: perl-base}
Requires: file
Requires: pam >= 0.77.3
Requires: sed
@@ -74,8 +74,8 @@
Suggests: rpm-utils
Suggests: tar
Suggests: unzip
-Obsoletes: tkmc
Obsoletes: mc46
+Obsoletes: tkmc
Conflicts: bash < 2.05b
Conflicts: rpm < 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -231,7 +231,7 @@
тільки власне Midnight Commander).
%prep
-%setup -q -a3 -n %{name}-%{version}
+%setup -q -a3
#rpm wrapper rewritten
#%patch0 -p1
%patch1 -p1
@@ -258,13 +258,13 @@
%{__autoconf}
%{__automake}
X11_WWW="
-if [ -f /usr/bin/iceweasel ]; then
+if [ -f %{_bindir}/iceweasel ]; then
iceweasel;
else
- if [ -f /usr/bin/galeon ]; then
+ if [ -f %{_bindir}/galeon ]; then
galeon
else
- if [ -f /usr/bin/mozilla ]; then
+ if [ -f %{_bindir}/mozilla ]; then
mozilla
else
xterm -c lynx
@@ -408,10 +408,10 @@
%lang(sr) %{_mandir}/sr/man1/*
%dir %{_sysconfdir}/mc
-%config(noreplace) %verify(not md5 mtime size) /etc/mc/Syntax
-%config(noreplace) %verify(not md5 mtime size) /etc/mc/*.*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mc/Syntax
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mc/*.*
%dir %{_sysconfdir}/mc/extfs
-%config(noreplace) %verify(not md5 mtime size) /etc/mc/extfs/*.*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mc/extfs/*.*
%files -n mcserv
%defattr(644,root,root,755)
@@ -430,6 +430,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.312 2010/02/26 16:09:20 pawelz
+- adapterized
+
Revision 1.311 2010/02/26 16:07:05 pawelz
- dropped unused BRs: indent, rpm-perl-prov
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.311&r2=1.312&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
