diff --git a/base/mc/0001-Ticket-4576-fix-visual-glitches-by-avoiding-g_module.patch b/base/mc/0001-Ticket-4576-fix-visual-glitches-by-avoiding-g_module.patch deleted file mode 100644 index f950a5a..0000000 --- a/base/mc/0001-Ticket-4576-fix-visual-glitches-by-avoiding-g_module.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur a/src/editor/spell.c b/src/editor/spell.c ---- a/src/editor/spell.c 2024-08-08 13:49:18.000000000 +0600 -+++ b/src/editor/spell.c 2024-10-03 16:07:15.840030146 +0600 -@@ -174,8 +174,9 @@ - - spell_module = g_module_open ("libaspell", G_MODULE_BIND_LAZY); - -- if (spell_module != NULL -- && ASPELL_FUNCTION_AVAILABLE (new_aspell_config) -+ if (spell_module == NULL) -+ return FALSE; -+ if (ASPELL_FUNCTION_AVAILABLE (new_aspell_config) - && ASPELL_FUNCTION_AVAILABLE (aspell_dict_info_list_elements) - && ASPELL_FUNCTION_AVAILABLE (aspell_dict_info_enumeration_next) - && ASPELL_FUNCTION_AVAILABLE (new_aspell_speller) diff --git a/base/mc/mc-tmpdir.patch b/base/mc/mc-tmpdir.patch index 969e050..c8ef41a 100644 --- a/base/mc/mc-tmpdir.patch +++ b/base/mc/mc-tmpdir.patch @@ -1,28 +1,30 @@ diff -Naur a/contrib/mc-wrapper.csh.in b/contrib/mc-wrapper.csh.in ---- a/contrib/mc-wrapper.csh.in 2024-08-08 13:49:18.000000000 +0600 -+++ b/contrib/mc-wrapper.csh.in 2024-08-25 08:34:15.121295453 +0600 +--- a/contrib/mc-wrapper.csh.in 2025-01-11 23:51:01.000000000 +0600 ++++ b/contrib/mc-wrapper.csh.in 2025-01-24 16:52:12.797670399 +0600 @@ -3,7 +3,7 @@ - if ($?TMPDIR) then - setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$ + else if ($?TMPDIR) then + setenv MC_PWD_FILE "`mktemp '$TMPDIR/mc.pwd.XXXXXX'`" else -- setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$ -+ setenv MC_PWD_FILE /var/tmp/mc-$MC_USER/mc.pwd.$$ +- setenv MC_PWD_FILE "`mktemp '/tmp/mc.pwd.XXXXXX'`" ++ setenv MC_PWD_FILE "`mktemp '/var/tmp/mc.pwd.XXXXXX'`" endif @bindir@/mc -P "$MC_PWD_FILE" $* diff -Naur a/contrib/mc-wrapper.sh.in b/contrib/mc-wrapper.sh.in ---- a/contrib/mc-wrapper.sh.in 2024-08-08 13:49:18.000000000 +0600 -+++ b/contrib/mc-wrapper.sh.in 2024-08-25 08:34:03.489374384 +0600 -@@ -1,5 +1,5 @@ - MC_USER=`whoami` --MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$" -+MC_PWD_FILE="${TMPDIR-/var/tmp}/mc-$MC_USER/mc.pwd.$$" - @bindir@/mc -P "$MC_PWD_FILE" "$@" +--- a/contrib/mc-wrapper.sh.in 2025-01-11 23:51:01.000000000 +0600 ++++ b/contrib/mc-wrapper.sh.in 2025-01-24 16:52:01.293741145 +0600 +@@ -3,7 +3,7 @@ + elif test -n "$TMPDIR"; then + MC_PWD_FILE="`mktemp "${TMPDIR}/mc.pwd.XXXXXX"`" + else +- MC_PWD_FILE="`mktemp "/tmp/mc.pwd.XXXXXX"`" ++ MC_PWD_FILE="`mktemp "/var/tmp/mc.pwd.XXXXXX"`" + fi - if test -r "$MC_PWD_FILE"; then + @bindir@/mc -P "$MC_PWD_FILE" "$@" diff -Naur a/lib/unixcompat.h b/lib/unixcompat.h ---- a/lib/unixcompat.h 2024-08-08 13:49:18.000000000 +0600 -+++ b/lib/unixcompat.h 2024-08-25 08:35:59.689585879 +0600 +--- a/lib/unixcompat.h 2025-01-11 23:51:01.000000000 +0600 ++++ b/lib/unixcompat.h 2025-01-24 16:56:14.605185482 +0600 @@ -108,7 +108,7 @@ #define PATH_SEP_STR "/" #define IS_PATH_SEP(c) ((c) == PATH_SEP) diff --git a/base/mc/mc.spec b/base/mc/mc.spec index c0d80af..94d7508 100644 --- a/base/mc/mc.spec +++ b/base/mc/mc.spec @@ -6,8 +6,8 @@ Summary: User-friendly text console file manager and visual shell Name: mc -Version: 4.8.32 -Release: 2%{?dist} +Version: 4.8.33 +Release: 1%{?dist} Epoch: 2 License: GPLv3+ Group: System Environment/Shells @@ -18,7 +18,6 @@ Patch2: %{name}-python3.patch Patch3: %{name}-default_setup.patch Patch4: %{name}-tmpdir.patch Patch5: %{name}-use-glib-older-than-2.40.patch -Patch6: 0001-Ticket-4576-fix-visual-glitches-by-avoiding-g_module.patch URL: http://www.midnight-commander.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,7 +67,6 @@ specific files. %if 0%{?rhel} <= 7 %patch5 -p1 -b .glib2 %endif -%patch6 -p1 -b .glib2 %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing" @@ -136,13 +134,13 @@ rm -rf %{buildroot} %lang(ru) %{_mandir}/ru/man1/mc.1* %lang(sr) %{_mandir}/sr/man1/mc.1* %{_sysconfdir}/profile.d/* -#%config(noreplace) %{_sysconfdir}/mc/mc.ext %config(noreplace) %{_sysconfdir}/mc/*edit* %config(noreplace) %{_sysconfdir}/mc/mc.keymap* %config(noreplace) %{_sysconfdir}/mc/mc.menu* %config(noreplace) %{_sysconfdir}/mc/*.ini %config(noreplace) %{_sysconfdir}/mc/mc.default.keymap* %config(noreplace) %{_sysconfdir}/mc/mc.emacs.keymap* +%config(noreplace) %{_sysconfdir}/mc/mc.vim.keymap* %dir %{_datadir}/mc %dir %{_sysconfdir}/mc %dir %{_libexecdir}/mc @@ -151,6 +149,9 @@ rm -rf %{buildroot} %dir %{_libexecdir}/mc/ext.d %changelog +* Fri Jan 24 2025 Raven 4.8.33-1 +- update to 4.8.33 + * Thu Oct 3 2024 Raven 4.8.32-2 - import patch to fix #4576