packages: mc/mc.spec - upgraded to 4.7.0.3, - set X11_WWW to use xdg-open (...

gotar gotar at pld-linux.org
Sat Feb 27 11:41:52 CET 2010


Author: gotar                        Date: Sat Feb 27 10:41:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 4.7.0.3,
- set X11_WWW to use xdg-open (it must be an executable accepting parameter,
  not script with newlines); S: xdg-utils

---- Files affected:
packages/mc:
   mc.spec (1.312 -> 1.313) 

---- Diffs:

================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.312 packages/mc/mc.spec:1.313
--- packages/mc/mc.spec:1.312	Fri Feb 26 17:09:20 2010
+++ packages/mc/mc.spec	Sat Feb 27 11:41:47 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - check spec-syntax,mo patches
-# - update ancient X11_WWW (or drop if it's no longer used)
 #
 # Conditional build:
 %bcond_with	ext2undel	# with ext2 undelete fs
@@ -22,12 +21,12 @@
 Summary(uk.UTF-8):	Диспетчер файлів Midnight Commander
 Summary(zh_CN.UTF-8):	一个方便实用的文件管理器和虚拟Shell
 Name:		mc
-Version:	4.7.0.2
+Version:	4.7.0.3
 Release:	1
 License:	GPL v2+
 Group:		Applications/Shells
 Source0:	http://www.midnight-commander.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	4618626cacd3481e39719a4571c1b5be
+# Source0-md5:	4ad6ed6667ab2364992285712e3207ea
 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
@@ -48,21 +47,21 @@
 URL:		http://www.midnight-commander.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?with_ext2undel:BuildRequires:	e2fsprogs-devel}
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel
+%ifnarch s390 s390x
+BuildRequires:	gpm-devel
+%endif
 BuildRequires:	libtool
 BuildRequires:	pam-devel
+# Needed? %%{?with_perl_vfs:Requires:	perl-base}
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	slang-devel >= 2.2.1
-%ifnarch s390 s390x
-BuildRequires:	gpm-devel
-%endif
-%{?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,6 +73,7 @@
 Suggests:	rpm-utils
 Suggests:	tar
 Suggests:	unzip
+Suggests:	xdg-utils
 Obsoletes:	mc46
 Obsoletes:	tkmc
 Conflicts:	bash < 2.05b
@@ -257,21 +257,8 @@
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-X11_WWW="
-if [ -f %{_bindir}/iceweasel ]; then
-	iceweasel;
-else
-	if [ -f %{_bindir}/galeon ]; then
-		galeon
-	else
-		if [ -f %{_bindir}/mozilla ]; then
-			mozilla
-		else
-			xterm -c lynx
-		fi;
-	fi;
-fi"
 
+export X11_WWW="xdg-open"
 %configure \
 	--enable-dependency-tracking \
 	--enable-charset \
@@ -430,6 +417,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.313  2010/02/27 10:41:47  gotar
+- upgraded to 4.7.0.3,
+- set X11_WWW to use xdg-open (it must be an executable accepting parameter,
+  not script with newlines); S: xdg-utils
+
 Revision 1.312  2010/02/26 16:09:20  pawelz
 - adapterized
 
================================================================

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



More information about the pld-cvs-commit mailing list