diff --git a/.gitignore b/.gitignore index c520844..f43c61a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -mc-4.7.4.tar.lzma +mc-4.7.5-pre1.tar.lzma diff --git a/mc-globfix.patch b/mc-globfix.patch deleted file mode 100644 index ab1ce2b..0000000 --- a/mc-globfix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mc-4.7.4/lib/search/glob.c.globfix mc-4.7.4/lib/search/glob.c ---- mc-4.7.4/lib/search/glob.c.globfix 2010-09-07 09:16:43.000000000 +0200 -+++ mc-4.7.4/lib/search/glob.c 2010-10-07 08:43:56.517785647 +0200 -@@ -144,7 +144,6 @@ mc_search__translate_replace_glob_to_reg - { - g_string_append_c (buff, '\\'); - c = ++cnt; -- continue; - } - break; - /* breaks copying: mc uses "\0" internally, it must not be changed */ diff --git a/mc.spec b/mc.spec index d51968c..2dbfa9d 100644 --- a/mc.spec +++ b/mc.spec @@ -1,12 +1,12 @@ Summary: User-friendly text console file manager and visual shell Name: mc -Version: 4.7.4 -Release: 5%{?dist} +Version: 4.7.5 +Release: 0.1.pre1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells # tarball created from git clone git://midnight-commander.org/git/mc.git -Source0: mc-%{version}.tar.lzma +Source0: mc-%{version}-pre1.tar.lzma URL: http://www.midnight-commander.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel e2fsprogs-devel slang-devel gpm-devel groff @@ -24,10 +24,9 @@ ability to FTP, view tar and zip files, and to poke into RPMs for specific files. %prep -%setup -q +%setup -q -n mc-4.7.5-pre1 %patch0 -p1 -b .extensions %patch1 -p1 -b .mcviewsegfault -%patch2 -p1 -b .globfix %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing" @@ -58,7 +57,6 @@ rm -rf $RPM_BUILD_ROOT %doc doc/FAQ doc/COPYING doc/NEWS doc/README %{_bindir}/mc %{_bindir}/mcedit -%{_bindir}/mcmfmt %{_bindir}/mcview %{_bindir}/mcdiff %{_datadir}/mc/* @@ -74,9 +72,6 @@ rm -rf $RPM_BUILD_ROOT %lang(ru) %{_mandir}/ru/man1/mc.1* %lang(sr) %{_mandir}/sr/man1/mc.1* %{_sysconfdir}/profile.d/* -%config %{_sysconfdir}/mc/Syntax -%config %{_sysconfdir}/mc/mc.charsets -%config %{_sysconfdir}/mc/mc.lib %config(noreplace) %{_sysconfdir}/mc/mc.ext %config(noreplace) %{_sysconfdir}/mc/*edit* %config(noreplace) %{_sysconfdir}/mc/mc.keymap* @@ -89,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc/extfs.d %changelog +* Wed Dec 8 2010 Jindrich Novy 4.7.5-0.1.pre1 +- update to 4.7.5 stable prerelease + * Fri Oct 15 2010 Jindrich Novy 4.7.4-5 - make cons.saver not suid root, it is no more needed (#640365) diff --git a/sources b/sources index d9a2de8..e5522e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9932eaef64b7501c01f06faa888e8998 mc-4.7.4.tar.lzma +ddba744654638b086f1f352744adc5b6 mc-4.7.5-pre1.tar.lzma