From 4218ddc1db60c57c27cf4ffe4e214c8ac00288a6 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Jan 04 2010 10:06:47 +0000 Subject: - update to 4.7.0.1 - update bindings to use xdg-open wherever possible --- diff --git a/.cvsignore b/.cvsignore index 2a6e726..131eb33 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mc-4.7.0-pre4-20091221git.tar.bz2 +mc-4.7.0.1.tar.lzma diff --git a/mc-extensions.patch b/mc-extensions.patch index 5cce02c..b5961a9 100644 --- a/mc-extensions.patch +++ b/mc-extensions.patch @@ -107,7 +107,7 @@ diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in # html regex/\.([hH][tT][mM][lL]?)$ - Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null -+ Open=(if test -n "$DISPLAY"; then (xdg-open file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null ++ Open=xdg-open file://%d/%p 1>&2 View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f # StarOffice 5.2 @@ -116,30 +116,30 @@ diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in # Microsoft Word Document regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$ - Open=(abiword %f >/dev/null 2>&1 &) -+ Open=(ooffice %f &) ++ Open=(xdg-open %f &) +# Open=(abiword %f >/dev/null 2>&1 &) View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f type/^Microsoft\ Word - Open=(abiword %f >/dev/null 2>&1 &) -+ Open=(ooffice %f &) ++ Open=(xdg-open %f &) +# Open=(abiword %f >/dev/null 2>&1 &) View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f # RTF document regex/\.([rR][tT][fF])$ - Open=(abiword %f >/dev/null 2>&1 &) -+ Open=(ooffice %f &) ++ Open=(xdg-open %f &) +# Open=(abiword %f >/dev/null 2>&1 &) # Microsoft Excel Worksheet regex/\.([xX][lL][sSwW])$ - Open=(gnumeric %f >/dev/null 2>&1 &) -+ Open=(ooffice %f &) ++ Open=(xdg-open %f &) +# Open=(gnumeric %f >/dev/null 2>&1 &) View=%view{ascii} xls2csv %f || strings %f type/^Microsoft\ Excel - Open=(gnumeric %f >/dev/null 2>&1 &) -+ Open=(ooffice %f &) ++ Open=(xdg-open %f &) +# Open=(gnumeric %f >/dev/null 2>&1 &) View=%view{ascii} xls2csv %f || strings %f diff --git a/mc.spec b/mc.spec index 03af35e..84c2756 100644 --- a/mc.spec +++ b/mc.spec @@ -1,19 +1,18 @@ Summary: User-friendly text console file manager and visual shell Name: mc -Version: 4.7.0 -Release: 0.6.pre4.20091221git%{?dist} +Version: 4.7.0.1 +Release: 1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells # tarball created from git clone git://midnight-commander.org/git/mc.git -Source0: mc-%{version}-pre4-20091221git.tar.bz2 +Source0: mc-%{version}.tar.lzma URL: http://www.midnight-commander.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext cvs automake autoconf libtool BuildRequires: glib2-devel e2fsprogs-devel slang-devel gpm-devel Requires: dev >= 3.3-3 -Patch1: mc-extensions.patch +Patch0: mc-extensions.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -24,21 +23,20 @@ specific files. %prep %setup -q -%patch1 -p1 -b .extensions +%patch0 -p1 -b .extensions %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" -./autogen.sh %configure --with-screen=slang \ --enable-charset \ --with-samba \ --without-x \ --with-gpm-mouse \ --disable-rpath \ - --with-mcfs + --enable-vfs-mcfs make %{?_smp_mflags} -%install +%install rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" @@ -84,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc %changelog +* Sat Jan 2 2010 Jindrich Novy 4.7.0.1-1 +- update to 4.7.0.1 +- update bindings to use xdg-open wherever possible + * Tue Dec 22 2009 Jindrich Novy 4.7.0-0.6.pre4.20091221git - provide yum-repo.syntax (#549014) - avoid occasional crash while reading panels (#548987) diff --git a/sources b/sources index 235b090..8d17448 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c03992e430a41d3e73faa6360979cadf mc-4.7.0-pre4-20091221git.tar.bz2 +4fec587435388701fd137bbe99ec77cd mc-4.7.0.1.tar.lzma