From 98b2ad1ede39431e0a5c0353bee48f3f72e17d73223269a06fe02b960ac2a2b0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 31 Jan 2024 10:51:19 +0000 Subject: [PATCH 1/2] Accepting request 1142182 from home:ecsos - Update to 4.8.31 - Core * Minimal version of GLib is 2.32.0. - VFS * fish: drop support of native FISH server and protocol. Rename VFS to shell (#4232) * extfs; - uc1541 extfs: update up to 3.6 version (#4511) - s3+: port to Python3 (#4324) * Support for LZO/LZOP compression format (#4509) - Misc * Skins: add color for non-printable characters in editor (#4433) - Fixes * FTBFS on FreeBSD with ext2fs attribute support (#4493) * Broken stickchars (-a) mode (#4498) * Wrong timestamp after resuming of file copy operation (#4499) * Editor: wrong deletion of marked column (#3761) * Diff viewer: segfault when display of line numbers is enabled (#4500) * Tar VFS: broken handling of hard links (#4494) * Sftp VFS: failure establishing SSH session due hashed host names in ~/.ssh/known_hosts (#4506) * Shell VFS: incorrect file names with cyrillic or diacritic symbols (#4507) * mc.ext.ini: incorrect description of of how multiple sections and keys with same names are processed (#4497) * mc.ext.ini: unescaped backslash \ is treated as invalid escape sequence in glib-2.77.3 and glib-2.79 (#4502) * mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arhive (#4419) - Rebase mc-ext-audio.patch, mc-extd-xdg.patch and mc-vfs-fish-deleted_source_file.patch OBS-URL: https://build.opensuse.org/request/show/1142182 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=152 --- mc-4.8.30.sha256 | 2 - mc-4.8.30.tar.xz | 3 - mc-4.8.31.sha256 | 2 + mc-4.8.31.tar.xz | 3 + mc-ext-audio.patch | 26 +++--- mc-extd-xdg.patch | 117 ++++++++++++++++++-------- mc-vfs-fish-deleted_source_file.patch | 90 ++------------------ mc.changes | 29 +++++++ mc.spec | 9 +- 9 files changed, 141 insertions(+), 140 deletions(-) delete mode 100644 mc-4.8.30.sha256 delete mode 100644 mc-4.8.30.tar.xz create mode 100644 mc-4.8.31.sha256 create mode 100644 mc-4.8.31.tar.xz diff --git a/mc-4.8.30.sha256 b/mc-4.8.30.sha256 deleted file mode 100644 index 235a60b..0000000 --- a/mc-4.8.30.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -38171f22f889e3030ec9055463d3ecd7843984ab24e6497d8294d1c441a7ddb4 mc-4.8.30.tar.bz2 -5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df mc-4.8.30.tar.xz diff --git a/mc-4.8.30.tar.xz b/mc-4.8.30.tar.xz deleted file mode 100644 index 8f3b155..0000000 --- a/mc-4.8.30.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df -size 2380824 diff --git a/mc-4.8.31.sha256 b/mc-4.8.31.sha256 new file mode 100644 index 0000000..bc85b72 --- /dev/null +++ b/mc-4.8.31.sha256 @@ -0,0 +1,2 @@ +f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841 mc-4.8.31.tar.bz2 +24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a mc-4.8.31.tar.xz diff --git a/mc-4.8.31.tar.xz b/mc-4.8.31.tar.xz new file mode 100644 index 0000000..70931ed --- /dev/null +++ b/mc-4.8.31.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a +size 2385632 diff --git a/mc-ext-audio.patch b/mc-ext-audio.patch index f3ab36a..3f77574 100644 --- a/mc-ext-audio.patch +++ b/mc-ext-audio.patch @@ -1,26 +1,26 @@ -Index: mc-4.8.29/misc/mc.ext.ini.in +Index: mc-4.8.31/misc/mc.ext.ini.in =================================================================== ---- mc-4.8.29.orig/misc/mc.ext.ini.in -+++ mc-4.8.29/misc/mc.ext.ini.in -@@ -557,23 +557,26 @@ Open=@EXTHELPERSDIR@/image.sh open svg +--- mc-4.8.31.orig/misc/mc.ext.ini.in ++++ mc-4.8.31/misc/mc.ext.ini.in +@@ -591,23 +591,26 @@ Open=@EXTHELPERSDIR@/image.sh open avif [sound] - Regex=\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$ + Regex=\\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$ RegexIgnoreCase=true -Open=@EXTHELPERSDIR@/sound.sh open common +Include=audio View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common [mod] - Regex=\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ + Regex=\\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open mod -+View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod ++View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod [wav22] Shell=.waw22 ShellIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open wav22 -+View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod ++View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod [mp3] Shell=.mp3 @@ -30,15 +30,15 @@ Index: mc-4.8.29/misc/mc.ext.ini.in View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3 [ogg] -@@ -592,6 +595,7 @@ View=%view{ascii} @EXTHELPERSDIR@/sound. - Regex=\.(midi?|rmid?)$ +@@ -626,6 +629,7 @@ View=%view{ascii} @EXTHELPERSDIR@/sound. + Regex=\\.(midi?|rmid?)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open midi +View=%view{ascii} @EXTHELPERSDIR@/sound.sh view midi [wma] Shell=.wma -@@ -599,6 +603,10 @@ ShellIgnoreCase=true +@@ -633,6 +637,10 @@ ShellIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open wma View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma @@ -48,8 +48,8 @@ Index: mc-4.8.29/misc/mc.ext.ini.in + # Play list [playlist] - Regex=\.(m3u|pls)$ -@@ -1115,6 +1123,9 @@ View=%view{ascii} @EXTHELPERSDIR@/image. + Regex=\\.(m3u|pls)$ +@@ -1159,6 +1167,9 @@ View=%view{ascii} @EXTHELPERSDIR@/image. Open=@EXTHELPERSDIR@/video.sh open ALL_FORMATS View=%view{ascii} @EXTHELPERSDIR@/video.sh view ALL_FORMATS diff --git a/mc-extd-xdg.patch b/mc-extd-xdg.patch index 3a344d3..ccec3f6 100644 --- a/mc-extd-xdg.patch +++ b/mc-extd-xdg.patch @@ -1,72 +1,117 @@ -diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh ---- misc/ext.d.orig/archive.sh 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/archive.sh 2013-03-10 09:01:31.154705008 +0400 -@@ -173,3 +173,3 @@ +Index: misc/ext.d/archive.sh +=================================================================== +--- misc/ext.d/archive.sh.orig ++++ misc/ext.d/archive.sh +@@ -210,7 +210,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" "${pager}" -diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in ---- misc/ext.d.orig/doc.sh.in 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/doc.sh.in 2013-03-10 09:01:48.230710602 +0400 -@@ -190,3 +190,3 @@ + ;; + *) +Index: misc/ext.d/doc.sh.in +=================================================================== +--- misc/ext.d/doc.sh.in.orig ++++ misc/ext.d/doc.sh.in +@@ -210,7 +210,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" -diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh ---- misc/ext.d.orig/image.sh 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/image.sh 2013-03-10 09:02:00.086714848 +0400 -@@ -57,3 +57,3 @@ + ;; + *) +Index: misc/ext.d/image.sh +=================================================================== +--- misc/ext.d/image.sh.orig ++++ misc/ext.d/image.sh +@@ -64,7 +64,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" -diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in ---- misc/ext.d.orig/misc.sh.in 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/misc.sh.in 2013-03-10 09:02:13.470718625 +0400 -@@ -96,3 +96,3 @@ + ;; + *) +Index: misc/ext.d/misc.sh.in +=================================================================== +--- misc/ext.d/misc.sh.in.orig ++++ misc/ext.d/misc.sh.in +@@ -102,7 +102,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" -diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh ---- misc/ext.d.orig/package.sh 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/package.sh 2013-03-10 09:02:23.630723087 +0400 -@@ -53,3 +53,3 @@ + ;; + *) +Index: misc/ext.d/package.sh +=================================================================== +--- misc/ext.d/package.sh.orig ++++ misc/ext.d/package.sh +@@ -51,7 +51,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" -diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh ---- misc/ext.d.orig/sound.sh 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/sound.sh 2013-03-10 09:02:31.222725342 +0400 -@@ -105,3 +105,3 @@ + ;; + *) +Index: misc/ext.d/sound.sh +=================================================================== +--- misc/ext.d/sound.sh.orig ++++ misc/ext.d/sound.sh +@@ -116,7 +116,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" -diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in ---- misc/ext.d.orig/text.sh.in 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/text.sh.in 2013-03-10 09:02:39.018727707 +0400 -@@ -143,3 +143,3 @@ + ;; + *) +Index: misc/ext.d/text.sh.in +=================================================================== +--- misc/ext.d/text.sh.in.orig ++++ misc/ext.d/text.sh.in +@@ -147,7 +147,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" "${pager}" -diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh ---- misc/ext.d.orig/video.sh 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/video.sh 2013-03-10 09:02:48.414731630 +0400 -@@ -62,3 +62,3 @@ + ;; + *) +Index: misc/ext.d/video.sh +=================================================================== +--- misc/ext.d/video.sh.orig ++++ misc/ext.d/video.sh +@@ -66,7 +66,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" -diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in ---- misc/ext.d.orig/web.sh.in 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/web.sh.in 2013-03-10 09:02:56.670734093 +0400 -@@ -48,3 +48,3 @@ + ;; + *) +Index: misc/ext.d/web.sh.in +=================================================================== +--- misc/ext.d/web.sh.in.orig ++++ misc/ext.d/web.sh.in +@@ -47,7 +47,7 @@ view) + do_view_action "${filetype}" + ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ + test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" + ;; + *) diff --git a/mc-vfs-fish-deleted_source_file.patch b/mc-vfs-fish-deleted_source_file.patch index 7bed01b..361006f 100644 --- a/mc-vfs-fish-deleted_source_file.patch +++ b/mc-vfs-fish-deleted_source_file.patch @@ -1,8 +1,8 @@ -Index: mc-4.8.26/src/filemanager/file.c +Index: mc-4.8.31/src/filemanager/file.c =================================================================== ---- mc-4.8.26.orig/src/filemanager/file.c -+++ mc-4.8.26/src/filemanager/file.c -@@ -2653,6 +2653,8 @@ copy_file_file (file_op_total_context_t +--- mc-4.8.31.orig/src/filemanager/file.c ++++ mc-4.8.31/src/filemanager/file.c +@@ -2744,6 +2744,8 @@ copy_file_file (file_op_total_context_t continue; if (temp_status == FILE_ABORT) return_status = temp_status; @@ -11,7 +11,7 @@ Index: mc-4.8.26/src/filemanager/file.c if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; break; -@@ -2663,6 +2665,8 @@ copy_file_file (file_op_total_context_t +@@ -2754,6 +2756,8 @@ copy_file_file (file_op_total_context_t temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; @@ -20,7 +20,7 @@ Index: mc-4.8.26/src/filemanager/file.c if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; return_status = temp_status; -@@ -2689,10 +2693,10 @@ copy_file_file (file_op_total_context_t +@@ -2785,10 +2789,10 @@ copy_file_file (file_op_total_context_t if (temp_status == FILE_SKIPALL) { ctx->skip_all = TRUE; @@ -33,7 +33,7 @@ Index: mc-4.8.26/src/filemanager/file.c break; } -@@ -2705,10 +2709,10 @@ copy_file_file (file_op_total_context_t +@@ -2801,10 +2805,10 @@ copy_file_file (file_op_total_context_t if (temp_status == FILE_SKIPALL) { ctx->skip_all = TRUE; @@ -46,79 +46,3 @@ Index: mc-4.8.26/src/filemanager/file.c break; } -Index: mc-4.8.26/src/vfs/fish/fishdef.h -=================================================================== ---- mc-4.8.26.orig/src/vfs/fish/fishdef.h -+++ mc-4.8.26/src/vfs/fish/fishdef.h -@@ -149,13 +149,19 @@ - "FILESIZE=${FISH_FILESIZE}\n" \ - "#STOR $FILESIZE $FILENAME\n" \ - "echo \"### 001\"\n" \ -+"touch $FILENAME 2>/dev/null\n" \ -+"if [ -f $FILENAME ]; then\n" \ -+"rm $FILENAME\n" \ - "{\n" \ - " while [ $FILESIZE -gt 0 ]; do\n" \ - " cnt=`expr \\( $FILESIZE + 255 \\) / 256`\n" \ - " n=`dd bs=256 count=$cnt | tee -a \"${FILENAME}\" | wc -c`\n" \ - " FILESIZE=`expr $FILESIZE - $n`\n" \ - " done\n" \ --"}; echo \"### 200\"\n" -+"}; echo \"### 200\"\n" \ -+"else\n" \ -+" echo \"### 500\"\n" \ -+"fi\n" - - /* default 'appe' script */ - #define FISH_APPEND_DEF_CONTENT "" \ -Index: mc-4.8.26/src/vfs/fish/helpers/chmod -=================================================================== ---- mc-4.8.26.orig/src/vfs/fish/helpers/chmod -+++ mc-4.8.26/src/vfs/fish/helpers/chmod -@@ -1,6 +1,7 @@ - #CHMOD $FISH_FILEMODE $FISH_FILENAME --if chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null; then -- echo "### 000" --else -+chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null -+if [ $? -ne 0 ]; then - echo "### 500" -+else -+ echo "### 000" - fi -Index: mc-4.8.26/src/vfs/fish/helpers/chown -=================================================================== ---- mc-4.8.26.orig/src/vfs/fish/helpers/chown -+++ mc-4.8.26/src/vfs/fish/helpers/chown -@@ -1,6 +1,7 @@ - #CHOWN $FISH_FILEOWNER:$FISH_FILEGROUP $FISH_FILENAME --if chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" ; then -- echo "### 000" --else -+chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" -+if [ $? -ne 0 ]; then - echo "### 500" -+else -+ echo "### 000" - fi -Index: mc-4.8.26/src/vfs/fish/helpers/send -=================================================================== ---- mc-4.8.26.orig/src/vfs/fish/helpers/send -+++ mc-4.8.26/src/vfs/fish/helpers/send -@@ -1,6 +1,9 @@ - #STOR $FISH_FILESIZE $FISH_FILENAME - FILENAME="/${FISH_FILENAME}" - echo "### 001" -+touch $FILENAME 2>/dev/null -+if [ -f $FILENAME ]; then -+rm $FILENAME 2>/dev/null - { - > "${FILENAME}" - bss=4096 -@@ -15,3 +18,6 @@ echo "### 001" - FISH_FILESIZE=`expr $FISH_FILESIZE - $n` - done - }; echo "### 200" -+else -+ echo "### 500" -+fi diff --git a/mc.changes b/mc.changes index e211263..0bfac9d 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Jan 29 06:42:45 UTC 2024 - ecsos + +- Update to 4.8.31 + - Core + * Minimal version of GLib is 2.32.0. + - VFS + * fish: drop support of native FISH server and protocol. Rename VFS to shell (#4232) + * extfs; + - uc1541 extfs: update up to 3.6 version (#4511) + - s3+: port to Python3 (#4324) + * Support for LZO/LZOP compression format (#4509) + - Misc + * Skins: add color for non-printable characters in editor (#4433) + - Fixes + * FTBFS on FreeBSD with ext2fs attribute support (#4493) + * Broken stickchars (-a) mode (#4498) + * Wrong timestamp after resuming of file copy operation (#4499) + * Editor: wrong deletion of marked column (#3761) + * Diff viewer: segfault when display of line numbers is enabled (#4500) + * Tar VFS: broken handling of hard links (#4494) + * Sftp VFS: failure establishing SSH session due hashed host names in ~/.ssh/known_hosts (#4506) + * Shell VFS: incorrect file names with cyrillic or diacritic symbols (#4507) + * mc.ext.ini: incorrect description of of how multiple sections and keys with same names are processed (#4497) + * mc.ext.ini: unescaped backslash \ is treated as invalid escape sequence in glib-2.77.3 and glib-2.79 (#4502) + * mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arhive (#4419) +- Rebase mc-ext-audio.patch, mc-extd-xdg.patch and + mc-vfs-fish-deleted_source_file.patch + ------------------------------------------------------------------- Tue Aug 15 09:25:39 UTC 2023 - ecsos diff --git a/mc.spec b/mc.spec index f2de78e..3c7bf6b 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: mc -Version: 4.8.30 +Version: 4.8.31 Release: 0 Summary: Midnight Commander License: GPL-3.0-or-later @@ -61,7 +61,7 @@ Patch100: xls2csv_update.patch BuildRequires: audiofile-devel BuildRequires: e2fsprogs-devel BuildRequires: gettext >= 0.18.1 -BuildRequires: glib2-devel >= 2.26.0 +BuildRequires: glib2-devel >= 2.32.0 BuildRequires: gpm-devel BuildRequires: libssh2-devel BuildRequires: libtool @@ -113,6 +113,8 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU %patch42 -p1 %patch52 -p1 %patch100 -p1 +# rpmlint +sed -i -e 's|\/usr\/bin\/env python3|\/usr\/bin\/python|g' src/vfs/extfs/helpers/uc1541 %build %{?!make_build:%define make_build make -O %_smp_mflags V=1 VERBOSE=1} @@ -191,6 +193,7 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %dir %{_libexecdir}/mc %{_libexecdir}/mc/ext.d %{_libexecdir}/mc/extfs.d +%{_libexecdir}/mc/shell %verify(not mode) %{_libexecdir}/mc/cons.saver %exclude %{_mandir}/*/man1/* %{_mandir}/man1/* From 44ba7aac8c8b1090bc21cb2dc01370f0f9158beae25b6cbf3375acf7edac34a5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 29 Feb 2024 11:10:23 +0000 Subject: [PATCH 2/2] Accepting request 1149815 from home:pgajdos:m - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1149815 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=153 --- mc.changes | 5 +++++ mc.spec | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/mc.changes b/mc.changes index 0bfac9d..3d48dce 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 23 11:00:04 UTC 2024 - pgajdos@suse.com + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Jan 29 06:42:45 UTC 2024 - ecsos diff --git a/mc.spec b/mc.spec index 3c7bf6b..eb42c19 100644 --- a/mc.spec +++ b/mc.spec @@ -95,24 +95,24 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension. %prep echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOURCE0}" | sha256sum -c %setup -q -%patch0 -%patch61 -%patch62 -%patch63 -%patch64 -%patch69 -%patch71 -p1 -%patch12 -p1 -%patch16 -%patch20 -%patch21 -%patch22 -p1 -%patch23 -%patch32 -%patch41 -p1 -%patch42 -p1 -%patch52 -p1 -%patch100 -p1 +%patch -P 0 +%patch -P 61 +%patch -P 62 +%patch -P 63 +%patch -P 64 +%patch -P 69 +%patch -P 71 -p1 +%patch -P 12 -p1 +%patch -P 16 +%patch -P 20 +%patch -P 21 +%patch -P 22 -p1 +%patch -P 23 +%patch -P 32 +%patch -P 41 -p1 +%patch -P 42 -p1 +%patch -P 52 -p1 +%patch -P 100 -p1 # rpmlint sed -i -e 's|\/usr\/bin\/env python3|\/usr\/bin\/python|g' src/vfs/extfs/helpers/uc1541