From 9f02a1103c3c6ae0c32f42c679772246d649b60c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 21 May 2024 01:13:04 +0300 Subject: [PATCH] import gnome-commander-1.16.2-1.el9 --- .gitignore | 2 +- .gnome-commander.metadata | 2 +- ...mmander-MR55-fix-double-g_free_error.patch | 27 ------------------- SPECS/gnome-commander.spec | 11 ++++---- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 SOURCES/gnome-commander-MR55-fix-double-g_free_error.patch diff --git a/.gitignore b/.gitignore index 43a3c2b..feeba65 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-commander-1.16.1.tar.xz +SOURCES/gnome-commander-1.16.2.tar.xz diff --git a/.gnome-commander.metadata b/.gnome-commander.metadata index c8f8148..fd724ca 100644 --- a/.gnome-commander.metadata +++ b/.gnome-commander.metadata @@ -1 +1 @@ -de8c9c55efb8228df0c9a74a9e0443aff23cccc8 SOURCES/gnome-commander-1.16.1.tar.xz +a1d1bf08b9324cba49180730b9deb6277abe3b8f SOURCES/gnome-commander-1.16.2.tar.xz diff --git a/SOURCES/gnome-commander-MR55-fix-double-g_free_error.patch b/SOURCES/gnome-commander-MR55-fix-double-g_free_error.patch deleted file mode 100644 index 783d7a8..0000000 --- a/SOURCES/gnome-commander-MR55-fix-double-g_free_error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ed704b30992b7f576060c424e431d6909504b9b4 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Thu, 18 Apr 2024 19:56:24 +0900 -Subject: [PATCH] Fix double g_error_free call in remote_close_callback - -gnome_cmd_error_message() calls g_error_free() internally, -so no need to call g_error_free() again in -remote_close_callback(). ---- - src/gnome-cmd-con-remote.cc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/gnome-cmd-con-remote.cc b/src/gnome-cmd-con-remote.cc -index 85f87e3d..39a131e5 100644 ---- a/src/gnome-cmd-con-remote.cc -+++ b/src/gnome-cmd-con-remote.cc -@@ -125,7 +125,6 @@ static void remote_close_callback(GObject *gobj, GAsyncResult *result, gpointer - if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED)) - { - gnome_cmd_error_message(_("Disconnect error"), error); -- g_error_free(error); - return; - } - if (error) --- -GitLab - diff --git a/SPECS/gnome-commander.spec b/SPECS/gnome-commander.spec index a96035b..9768bb0 100644 --- a/SPECS/gnome-commander.spec +++ b/SPECS/gnome-commander.spec @@ -39,8 +39,8 @@ %endif %global shortver 1.16 -%global fullver %{shortver}.1 -%global baserelease 6 +%global fullver %{shortver}.2 +%global baserelease 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -75,9 +75,6 @@ Source1: gnome-commander.sh Source2: create-gcmd-git-bare-tarball.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -# https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/55 -# https://bugzilla.redhat.com/show_bug.cgi?id=2271363 -Patch2: gnome-commander-MR55-fix-double-g_free_error.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -181,7 +178,6 @@ git commit -m "base" -q %patch -P1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a -cat %PATCH2 | git am %if 0%{?use_release} %endif @@ -292,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon May 20 2024 Mamoru TASAKA - 4:1.16.2-1 +- 1.16.2 + * Thu Apr 18 2024 Mamoru TASAKA - 4:1.16.1-6 - Fix double g_error_free call in remote_close_callback (bug 2271363)