diff --git a/_service b/_service new file mode 100644 index 0000000..c1fdc03 --- /dev/null +++ b/_service @@ -0,0 +1,7 @@ + + + ftp.midnight-commander.org + http + /mc-4.8.25.tar.xz + +ftp.midnight-commander.orghttp/mc-4.8.25.sha256ftp.midnight-commander.orghttp/mc-4.8.25.tar.xz \ No newline at end of file diff --git a/_service:download_url:mc-4.8.25.sha256 b/_service:download_url:mc-4.8.25.sha256 new file mode 100644 index 0000000..7fa4d52 --- /dev/null +++ b/_service:download_url:mc-4.8.25.sha256 @@ -0,0 +1,2 @@ +407dc20f70082f26c7f5716406cb755cbb6cba3f2f13b841b79a991282d310c2 mc-4.8.25.tar.bz2 +ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a mc-4.8.25.tar.xz diff --git a/_service:download_url:mc-4.8.25.tar.xz b/_service:download_url:mc-4.8.25.tar.xz new file mode 100644 index 0000000..4bef970 --- /dev/null +++ b/_service:download_url:mc-4.8.25.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a +size 2488324 diff --git a/mc-4.8.24.sha256 b/mc-4.8.24.sha256 deleted file mode 100644 index 0060231..0000000 --- a/mc-4.8.24.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34 mc-4.8.24.tar.bz2 -859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46 mc-4.8.24.tar.xz diff --git a/mc-4.8.24.tar.xz b/mc-4.8.24.tar.xz deleted file mode 100644 index 2aa28cc..0000000 --- a/mc-4.8.24.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46 -size 2434988 diff --git a/mc-4.8.25.sha256 b/mc-4.8.25.sha256 new file mode 100644 index 0000000..7fa4d52 --- /dev/null +++ b/mc-4.8.25.sha256 @@ -0,0 +1,2 @@ +407dc20f70082f26c7f5716406cb755cbb6cba3f2f13b841b79a991282d310c2 mc-4.8.25.tar.bz2 +ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a mc-4.8.25.tar.xz diff --git a/mc-4.8.25.tar.xz b/mc-4.8.25.tar.xz new file mode 100644 index 0000000..4bef970 --- /dev/null +++ b/mc-4.8.25.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a +size 2488324 diff --git a/mc-ext-audio.patch b/mc-ext-audio.patch index d347c10..917aecf 100644 --- a/mc-ext-audio.patch +++ b/mc-ext-audio.patch @@ -1,6 +1,6 @@ ---- misc/mc.ext.in.orig 2012-12-11 01:04:32.000000000 +0400 -+++ misc/mc.ext.in 2013-03-10 10:59:02.741159661 +0400 -@@ -467,16 +467,19 @@ +--- misc/mc.ext.in.orig 2020-07-05 14:38:53.000000000 -0300 ++++ misc/mc.ext.in 2020-07-24 08:11:38.576087946 -0300 +@@ -481,16 +481,19 @@ ### Sound files ### regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$ @@ -21,8 +21,8 @@ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3 regex/i/\.og[gax]$ -@@ -484,15 +484,22 @@ - View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg +@@ -502,15 +505,22 @@ + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view opus regex/i/\.(spx|flac)$ - Open=@EXTHELPERSDIR@/sound.sh open common diff --git a/mc-extd-sound.patch b/mc-extd-sound.patch index 32d41bb..ab938d6 100644 --- a/mc-extd-sound.patch +++ b/mc-extd-sound.patch @@ -1,6 +1,6 @@ ---- misc/ext.d/sound.sh.orig 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/sound.sh 2013-03-10 11:54:01.186301679 +0400 -@@ -6,27 +6,46 @@ +--- misc/ext.d/sound.sh.orig 2020-07-05 14:38:53.000000000 -0300 ++++ misc/ext.d/sound.sh 2020-07-24 08:30:33.348037353 -0300 +@@ -6,18 +6,37 @@ action=$1 filetype=$2 @@ -40,6 +40,9 @@ - ogginfo "${MC_EXT_FILENAME}" + type -p ogginfo && ogginfo "${MC_EXT_FILENAME}" && return 0 ;; + opus) + opusinfo "${MC_EXT_FILENAME}" +@@ -25,11 +44,11 @@ wma) mplayer -quiet -slave -frames 0 -vo null -ao null -identify "${MC_EXT_FILENAME}" 2>/dev/null | \ tail +13 || file "${MC_EXT_FILENAME}" diff --git a/mc-rpm.patch b/mc-rpm.patch deleted file mode 100644 index f895d66..0000000 --- a/mc-rpm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -purN a/src/vfs/extfs/helpers/rpm b/src/vfs/extfs/helpers/rpm ---- a/src/vfs/extfs/helpers/rpm 2017-02-24 21:25:57.000000000 +0100 -+++ b/src/vfs/extfs/helpers/rpm 2017-02-25 02:37:57.000000000 +0100 -@@ -162,6 +162,10 @@ mcrpmfs_list_fastRPM () - echo "$FILEPREF 0 $DATE INFO/REQUIRES" - echo "$FILEPREF 0 $DATE INFO/OBSOLETES" - echo "$FILEPREF 0 $DATE INFO/PROVIDES" -+ echo "$FILEPREF 0 $DATE INFO/ENHANCES" -+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS" -+ echo "$FILEPREF 0 $DATE INFO/RECOMMENDS" -+ echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS" - echo "$FILEPREF 0 $DATE INFO/CONFLICTS" - echo "$FILEPREF 0 $DATE INFO/CHANGELOG" - } -@@ -301,6 +305,10 @@ mcrpmfs_copyout () - INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;; - INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;; - INFO/REQUIRES) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; -+ INFO/ENHANCES) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;; -+ INFO/SUGGESTS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;; -+ INFO/RECOMMENDS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;; -+ INFO/SUPPLEMENTS) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;; - INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;; - INFO/SCRIPTS/PRETRANS) mcrpmfs_getRawOneTag "%{RPMTAG_PRETRANS}\n" >"$2"; exit 0;; - INFO/SCRIPTS/PRETRANSPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PRETRANSPROG}\n" >"$2"; exit 0;; diff --git a/mc.changes b/mc.changes index b0b6eba..e5b08eb 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jul 27 15:00:00 UTC 2020 - Andre C. Barros + +- Update to 4.8.25 + * Avoid subshell warning for standalone mcedit/mcview/mcdiffview run from mc + * Implement chattr command (change ext{2,3,4}fs extended attributes) + * New syntax highlighting: Kotlin and ino + * File highlighting updates + * Lots of other fixes + +- Updated mc-ext-audio.patch +- Updated mc-extd-sound.patch +- Removed mc-rpm.patch + ------------------------------------------------------------------- Tue Mar 17 07:57:20 UTC 2020 - Paolo Stivanin diff --git a/mc.spec b/mc.spec index 974f5e4..5e7c14a 100644 --- a/mc.spec +++ b/mc.spec @@ -17,7 +17,7 @@ Name: mc -Version: 4.8.24 +Version: 4.8.25 Release: 0 Summary: Midnight Commander License: GPL-3.0-or-later @@ -32,7 +32,6 @@ Source6: http://ftp.midnight-commander.org/%{name}-%{version}.sha256 Patch0: mc-fix_lib_search_path.patch Patch12: mc-wrapper.patch Patch16: mc-esc-seq.patch -Patch17: mc-rpm.patch Patch20: mc-f-keys.patch Patch21: mc-extfs-helpers-deb.patch # add patch. bnc#856501 @@ -102,7 +101,6 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU %patch71 %patch12 -p1 %patch16 -%patch17 -p1 %patch20 %patch21 %patch22 -p1