From 86d37e7b4aa6275d319e23387e6a46790c0497e8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 27 Jul 2022 22:38:03 +0900 Subject: [PATCH 01/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild --- gnome-commander.spec | 5 ++++- noautobuild | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 noautobuild diff --git a/gnome-commander.spec b/gnome-commander.spec index 4dbf06e..2f33ed0 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -68,7 +68,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Release: %{fedorarel}%{flagrel}%{?dist}.1 Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 27 2022 Mamoru TASAKA - 4:1.14.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 19 2022 Mamoru TASAKA - 4:1.14.3-1 - 1.14.3 diff --git a/noautobuild b/noautobuild deleted file mode 100644 index 02c8cc6..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Check git later From a1478e06e7c11c165595a8558a1fd2d51a3ea3d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:24:37 +0000 Subject: [PATCH 02/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 2f33ed0..f346aec 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -68,7 +68,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist}.1 +Release: %{fedorarel}%{flagrel}%{?dist}.2 Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4:1.14.3-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 27 2022 Mamoru TASAKA - 4:1.14.3-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f13801c56c25b302801bd3d803ea3150710e9c0a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Jan 2023 15:15:15 +0900 Subject: [PATCH 03/40] 1.16.0 --- gnome-commander.spec | 176 ++++++++++--------------------------------- sources | 2 +- 2 files changed, 42 insertions(+), 136 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index f346aec..5ac54cf 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -2,18 +2,17 @@ %undefine _strict_symbol_defs_build %global EXIV2_REQ 0.14 -%global GLIB_REQ 2.44.0 -%global LIBGSF_REQ 1.12.0 -%global POPPLER_REQ 0.8 +%global GLIB_REQ 2.70.0 +%global LIBGSF_REQ 1.14.26 +%global POPPLER_REQ 0.18 %global TAGLIB_REQ 1.4 +%global UNIQUE_REQ 0.9.3 %global mimeedit_rev 1958 -%global use_autotool 0 -%global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global use_release 1 %global use_gitbare 0 @@ -39,8 +38,8 @@ %global if_pre 1 %endif -%global shortver 1.14 -%global fullver %{shortver}.3 +%global shortver 1.16 +%global fullver %{shortver}.0 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -50,25 +49,11 @@ %global fedorarel %{mainrel}.%{git_version} %endif -%if 0%{?if_pre} > 0 -%global use_autotool 1 -%endif -%if 0%{?use_autotool} < 1 -%global update_po 0 -%endif - -# Patch1 updates configure.in -%global use_autotool 1 - -# Autotool seems still needed to avoid build failure -# under doc/ diretory, need investigating -%global use_autotool 1 - Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist}.2 +Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -105,29 +90,22 @@ BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(libgsf-1) >= %{LIBGSF_REQ} BuildRequires: pkgconfig(poppler-glib) >= %{POPPLER_REQ} BuildRequires: pkgconfig(taglib) >= %{TAGLIB_REQ} -BuildRequires: pkgconfig(unique-1.0) +BuildRequires: pkgconfig(unique-1.0) >= %{UNIQUE_REQ} BuildRequires: libICE-devel BuildRequires: libSM-devel -BuildRequires: gnome-doc-utils -BuildRequires: perl(XML::Parser) - -%if %{use_autotool} -BuildRequires: automake +BuildRequires: meson BuildRequires: flex BuildRequires: intltool -BuildRequires: libtool -BuildRequires: gnome-common -%endif -BuildRequires: make +BuildRequires: yelp-tools + BuildRequires: %{_bindir}/git BuildRequires: %{_bindir}/appstream-util # %%check -BuildRequires: gtest-devel +BuildRequires: pkgconfig(gtest) -Requires: gnome-vfs2-smb Requires: meld Requires: gnome-icon-theme-legacy @@ -190,27 +168,6 @@ git config user.name "%{name} Fedora maintainer" git config user.email "%{name}-owner@fedoraproject.org" %if 0%{?use_release} -cat > .gitignore < 0 -( export NOCONFIGURE=1 ; sh autogen.sh ) -%endif +# Tweak samba detection +sed -i meson.build \ + -e 's|^\(samba = dependency\)|# \1|' \ + -e 's|^\(have_samba = .*\)$|have_samba = true|' \ + %{nil} +git commit -m "Tweak samba detection" -a -%{__sed} -i.pylib \ - -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ - configure +# Don't install unneeded files +find . -name meson.build | xargs sed -i \ + -e '\@install_headers@,\@^)$@s|^\(.*\)$|# \1|' \ + %{nil} +sed -i libgcmd/meson.build \ + -e '\@libgcmd = static_library@,$s@install: true@install : false@' \ + %{nil} +sed -i doc/meson.build \ + -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ + %{nil} +git commit -m "Don't install header files, static archives, documentation" -a %if 0%{?use_gitbare} pushd .. @@ -235,16 +203,11 @@ pushd .. # gzip #gzip -9 ChangeLog-* -mkdir TMPBINDIR -cd TMPBINDIR -ln -sf /bin/true ./update-mime-database - %if 0%{?use_gitbare} popd %endif %build -export PATH=$(pwd)/TMPBINDIR:$PATH export BUILD_TOP_DIR=$(pwd) %set_build_flags @@ -259,86 +222,27 @@ pushd %{name} # Install wrapper script, and move binaries to # %%{_libexecdir}/%%{name} -mkdir _builddir || : - -# For debuginfo issue -find . -name \*.cc | while read f -do - dirn=$(dirname $f) - %{__cat} $f | %{__sed} -n -e 's|^#line.*[ \t][ \t]*\"\(.*\)"$|\1|p' | \ - sort | uniq | while read g - do - %{__mkdir_p} _builddir/$dirn - %{__cp} -p $dirn/$g _builddir/$dirn - done -done - -pushd _builddir - -ln -sf ../configure -%configure \ - --srcdir=$(pwd)/.. \ +%meson \ --bindir=%{_libexecdir}/%{name} \ - --disable-Werror \ - --disable-scrollkeeper \ %{nil} -%{__cp} -p README ${BUILD_TOP_DIR} - -%if %{update_po} -%{__make} -C po gnome-commander.pot update-po -%endif - -# First make po without _smp_mflags, so that messages -# won't be mixed up -# Second doc/, parallel make seems to fail -%{__make} -C po GMSGFMT="msgfmt --statistics" -%{__make} -C doc -%{__make} %{?_smp_mflags} -k - -popd # from _builddir +%meson_build --ninja-args "-k 0" %if 0%{?use_gitbare} popd %endif %install -%{__rm} -rf %{buildroot} - -export PATH=$(pwd)/TMPBINDIR:$PATH - %if 0%{?use_gitbare} pushd %{name} %endif -pushd _builddir -%{__make} \ - INSTALL="%{__install} -c -p" \ - DESTDIR=%{buildroot} \ - install -popd # from _builddir - -# Desktop file -desktop-file-install \ - --delete-original \ - --vendor '' \ - --remove-category Application \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/org.gnome.%{name}.desktop +%meson_install # Install wrapper %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -cpm 0755 %SOURCE1 %{buildroot}%{_bindir}/%{name} -# install gnome-file-types-properties (bug 458667) -%if 0 -%{__install} -cpm 0755 mimeedit.sh \ - %{buildroot}%{_libexecdir}/%{name}/gnome-file-types-properties -%endif - -%{__rm} -f %{buildroot}%{_libdir}/%{name}/*.{a,la} -%{__rm} -f %{buildroot}%{_libdir}/%{name}/*/*.{a,la} - %if 0%{?use_gitbare} popd %endif @@ -346,15 +250,15 @@ popd %find_lang %{name} %check +desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.%{name}.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.%{name}.appdata.xml %if 0%{?use_gitbare} pushd %{name} %endif -pushd _builddir export ASAN_OPTIONS=detect_leaks=0 -make check +%meson_test -v %if 0%{?use_gitbare} popd @@ -364,10 +268,9 @@ popd %defattr(-,root,root,-) %doc AUTHORS %doc BUGS -%doc ChangeLog* -%doc COPYING +%license COPYING %doc NEWS -%doc README +%doc README.md %doc TODO %doc doc/*.txt @@ -383,10 +286,13 @@ popd %{_datadir}/glib-2.0/schemas/org.gnome.*xml -%{_datadir}/pixmaps/%{name}.svg +%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jan 25 2023 Mamoru TASAKA - 4:1.16.0-1 +- 1.16.0 + * Thu Jan 19 2023 Fedora Release Engineering - 4:1.14.3-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b57f028..9126aaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.14.3.tar.xz) = a3a89b922c23b49587d1b459760a263c886636735549c8dcd592b1ccb838838a3748ec83eb65ca8bbb62d82d4b588479a7673314d6924075b733b31318e52756 +SHA512 (gnome-commander-1.16.0.tar.xz) = 9e23afb9b58e1f24e8a67f81fcf9c9bbae02c07d184cf9ffd4bc56d1e4b705ea355b95ce16209d50b743898cdb7bf0b6b8730eaa44f09001d9fa9a834fcbccae From 60611d0b617dfe9079c33769bae1ca7ed762131a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Jan 2023 15:17:50 +0900 Subject: [PATCH 04/40] kill sanitizer --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5ac54cf..a4163c9 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -12,7 +12,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 From 3a1d0b44cf01adbeaa9c7ea66f21a9e2495039e1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:08:42 +0900 Subject: [PATCH 05/40] rename release macro to make rpmdev-bumprelease work --- gnome-commander.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a4163c9..87dbb36 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -43,17 +43,17 @@ %global mainrel 1 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Release: %{baserelease}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME From 889c064da88eac384f3f5a87a63ea646652bfce6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:12:13 +0900 Subject: [PATCH 06/40] fix baserelease usage --- gnome-commander.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 87dbb36..cb52a15 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,20 +40,20 @@ %global shortver 1.16 %global fullver %{shortver}.0 -%global mainrel 1 +%global baserelease 1 %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{baserelease}%{flagrel}%{?dist} +Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME From a406918ec1e6b8a6b36a9e741ba3195eba190141 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Jul 2023 18:11:05 +0900 Subject: [PATCH 07/40] 1.16.1 --- gnome-commander.spec | 17 +++++++---------- sources | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index cb52a15..ec101e8 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -39,7 +39,7 @@ %endif %global shortver 1.16 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %global baserelease 1 %if 0%{?use_release} >= 1 @@ -100,8 +100,8 @@ BuildRequires: flex BuildRequires: intltool BuildRequires: yelp-tools -BuildRequires: %{_bindir}/git -BuildRequires: %{_bindir}/appstream-util +BuildRequires: /usr/bin/git +BuildRequires: /usr/bin/appstream-util # %%check BuildRequires: pkgconfig(gtest) @@ -172,7 +172,7 @@ git add . git commit -m "base" -q %endif -%patch1 -p1 -b .path +%patch -P1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif @@ -185,12 +185,6 @@ sed -i meson.build \ git commit -m "Tweak samba detection" -a # Don't install unneeded files -find . -name meson.build | xargs sed -i \ - -e '\@install_headers@,\@^)$@s|^\(.*\)$|# \1|' \ - %{nil} -sed -i libgcmd/meson.build \ - -e '\@libgcmd = static_library@,$s@install: true@install : false@' \ - %{nil} sed -i doc/meson.build \ -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ %{nil} @@ -290,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Jul 10 2023 Mamoru TASAKA - 4:1.16.1-1 +- 1.16.1 + * Wed Jan 25 2023 Mamoru TASAKA - 4:1.16.0-1 - 1.16.0 diff --git a/sources b/sources index 9126aaf..bec4d0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.16.0.tar.xz) = 9e23afb9b58e1f24e8a67f81fcf9c9bbae02c07d184cf9ffd4bc56d1e4b705ea355b95ce16209d50b743898cdb7bf0b6b8730eaa44f09001d9fa9a834fcbccae +SHA512 (gnome-commander-1.16.1.tar.xz) = 3a42671350e071552f82e44cf09e7598c9851a8d0b47cedc059a23347e8da71e1cc140f16191b31b1e66b74d803240db63a0eb8ba6a189dfc64315783fb954e0 From 4b55e96bc8af871823a0fe5fc539771f4252c6d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:32:24 +0000 Subject: [PATCH 08/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index ec101e8..dda7a62 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 1 +%global baserelease 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -284,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4:1.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 10 2023 Mamoru TASAKA - 4:1.16.1-1 - 1.16.1 From 1b26f0ba548aa12132a9251e51d93c1361fd293c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:52:09 +0000 Subject: [PATCH 09/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index dda7a62..b659394 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 2 +%global baserelease 3 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -284,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4:1.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 4:1.16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 184d9c271652c287896da4400a646599793e46ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 15:26:34 +0000 Subject: [PATCH 10/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b659394..56b1b08 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 3 +%global baserelease 4 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -284,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 4:1.16.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4:1.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 63b505fb1b50197d682996ef473d49688f4a17ff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Jan 2024 17:11:49 +0900 Subject: [PATCH 11/40] SPDX migration --- gnome-commander.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 56b1b08..dea6a1f 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 4 +%global baserelease 5 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -58,7 +58,11 @@ Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME -License: GPLv2+ +# Overall GPL-2.0-or-later +# data/org.gnome.gnome-commander.appdata.xml.in CC0-1.0 +# doc/C/legal.xml GFDL-1.1-or-later +# SPDX confirmed +License: GPL-2.0-or-later AND GFDL-1.1-or-later AND CC0-1.0 URL: http://gcmd.github.io/ %if 0%{?use_release} Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{shortver}/%{name}-%{version}%{?extratag:-%extratag}.tar.xz @@ -284,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Jan 28 2024 Mamoru TASAKA - 4:1.16.1-5 +- SPDX migration + * Wed Jan 24 2024 Fedora Release Engineering - 4:1.16.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1cb843a399302dde810e7ddd70b57ae0bd16633f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Apr 2024 20:13:16 +0900 Subject: [PATCH 12/40] Fix double g_error_free call in remote_close_callback (bug 2271363) --- ...mmander-MR55-fix-double-g_free_error.patch | 27 +++++++++++++++++++ gnome-commander.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnome-commander-MR55-fix-double-g_free_error.patch diff --git a/gnome-commander-MR55-fix-double-g_free_error.patch b/gnome-commander-MR55-fix-double-g_free_error.patch new file mode 100644 index 0000000..783d7a8 --- /dev/null +++ b/gnome-commander-MR55-fix-double-g_free_error.patch @@ -0,0 +1,27 @@ +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/gnome-commander.spec b/gnome-commander.spec index dea6a1f..27f108b 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 5 +%global baserelease 6 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -75,6 +75,9 @@ 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} @@ -178,6 +181,7 @@ 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 @@ -288,6 +292,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Apr 18 2024 Mamoru TASAKA - 4:1.16.1-6 +- Fix double g_error_free call in remote_close_callback (bug 2271363) + * Sun Jan 28 2024 Mamoru TASAKA - 4:1.16.1-5 - SPDX migration From 45b4154df3e3ff7c2ba6f3e4345b27a27455743f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 20 May 2024 12:18:44 +0900 Subject: [PATCH 13/40] 1.16.2 --- ...mmander-MR55-fix-double-g_free_error.patch | 27 ------------------- gnome-commander.spec | 11 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 gnome-commander-MR55-fix-double-g_free_error.patch diff --git a/gnome-commander-MR55-fix-double-g_free_error.patch b/gnome-commander-MR55-fix-double-g_free_error.patch deleted file mode 100644 index 783d7a8..0000000 --- a/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/gnome-commander.spec b/gnome-commander.spec index 27f108b..5838e11 100644 --- a/gnome-commander.spec +++ b/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) diff --git a/sources b/sources index bec4d0d..cad2396 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.16.1.tar.xz) = 3a42671350e071552f82e44cf09e7598c9851a8d0b47cedc059a23347e8da71e1cc140f16191b31b1e66b74d803240db63a0eb8ba6a189dfc64315783fb954e0 +SHA512 (gnome-commander-1.16.2.tar.xz) = da2675a6625a67ab873d49f1caf939c30a317ecc0cb9b15c794b27c4a46dfba4cdea10266b380ef1e6809329ee770db4d7559a9cf94b575340b7fe4bb997d6c2 From e25fbc4cadb2ad899fbd7905a7bb8dad8a907c92 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Jun 2024 17:42:20 +0900 Subject: [PATCH 14/40] update to the latest git --- gnome-commander.spec | 68 +++++++++++++++++++++++++------------------- sources | 2 +- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5838e11..e5b2253 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -8,14 +8,12 @@ %global TAGLIB_REQ 1.4 %global UNIQUE_REQ 0.9.3 -%global mimeedit_rev 1958 - %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 -%global use_release 1 -%global use_gitbare 0 +%global use_release 0 +%global use_gitbare 1 %if 0%{?use_gitbare} < 1 # force @@ -28,32 +26,32 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20220113 -%global gittartime 1526 -%global gitbaredate 20220109 -%global git_rev fed9ef1a44cd01b6c1dfb231795e07f5f067de57 +%global gittardate 20240610 +%global gittartime 1620 +%global gitbaredate 20240605 +%global git_rev aaac617691ba6be14cd563a5ee341993bbe20c77 %global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{gitbaredate}git%{git_short} +%global git_version %{gitbaredate}git%{git_short} %global if_pre 1 +%global clamp_mtime_to_source_date_epoch 0 %endif -%global shortver 1.16 -%global fullver %{shortver}.2 -%global baserelease 1 +%global shortver 1.17 +%global fullver %{shortver}.0 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} +%global fedoraver %{fullver} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} +%global fedoraver %{fullver}%{?if_pre:~}%{!?if_pre:^}%{git_version} %endif Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 -Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Version: %{fedoraver} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -73,7 +71,6 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh -Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch BuildRequires: gcc-c++ @@ -89,7 +86,7 @@ BuildRequires: intltool BuildRequires: pkgconfig(exiv2) >= %{EXIV2_REQ} BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(libgsf-1) >= %{LIBGSF_REQ} BuildRequires: pkgconfig(poppler-glib) >= %{POPPLER_REQ} @@ -108,6 +105,7 @@ BuildRequires: /usr/bin/git BuildRequires: /usr/bin/appstream-util # %%check +BuildRequires: xorg-x11-server-Xvfb BuildRequires: pkgconfig(gtest) Requires: meld @@ -149,11 +147,22 @@ git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -n %{name}-%{fullver}-%{git_version} -T -a 0 git clone ./%{name}.git/ cd %{name} -git checkout -b %{version}-fedora %{git_rev} +git checkout -b %{fullver}-fedora %{git_rev} + +# Restore timestamps +set +x +echo "Restore timestamps" +git ls-tree -r --name-only HEAD | while read f +do + unixtime=$(git log -n 1 --pretty='%ct' -- $f) + touch -d "@${unixtime}" $f +done +set -x + cp -a [A-Z]* .. cp -a doc .. @@ -169,7 +178,7 @@ done %endif git config user.name "%{name} Fedora maintainer" -git config user.email "%{name}-owner@fedoraproject.org" +git config user.email "%{name}-maintainer@fedoraproject.org" %if 0%{?use_release} git add . @@ -188,12 +197,6 @@ sed -i meson.build \ %{nil} git commit -m "Tweak samba detection" -a -# Don't install unneeded files -sed -i doc/meson.build \ - -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ - %{nil} -git commit -m "Don't install header files, static archives, documentation" -a - %if 0%{?use_gitbare} pushd .. %endif @@ -256,7 +259,8 @@ pushd %{name} %endif export ASAN_OPTIONS=detect_leaks=0 -%meson_test -v +xvfb-run sh -c \ + "%meson_test -v" %if 0%{?use_gitbare} popd @@ -277,12 +281,16 @@ popd %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* +%{_datadir}/glib-2.0/schemas/org.gnome.*xml +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.txt +%{_datadir}/%{name}/icons/ + %{_datadir}/applications/org.gnome.%{name}.desktop %{_metainfodir}/org.gnome.%{name}.appdata.xml %{_datadir}/help/*/%{name}/ -%{_datadir}/glib-2.0/schemas/org.gnome.*xml %{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg %{_datadir}/pixmaps/%{name}/ diff --git a/sources b/sources index cad2396..9be0640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.16.2.tar.xz) = da2675a6625a67ab873d49f1caf939c30a317ecc0cb9b15c794b27c4a46dfba4cdea10266b380ef1e6809329ee770db4d7559a9cf94b575340b7fe4bb997d6c2 +SHA512 (gnome-commander-20240610T1620.tar.gz) = 0b118ded36e604db272e653f4e157f4ac285f7569ba0b1ce03f4d5490bfe40c87cce7b56a4831c46c56239bb2ceeaa47bda9d01f15bec174cf46c4bbee1f4e0d From 5d3441f7205361864cba70d9e01d8ef6f96e4965 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 11 Jun 2024 14:54:04 +0900 Subject: [PATCH 15/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index e5b2253..eb477d7 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240610 -%global gittartime 1620 -%global gitbaredate 20240605 -%global git_rev aaac617691ba6be14cd563a5ee341993bbe20c77 +%global gittardate 20240611 +%global gittartime 1445 +%global gitbaredate 20240610 +%global git_rev 2e447c53a664856c1e7778ddbff8de7611ab1ed1 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 9be0640..e3b5d12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240610T1620.tar.gz) = 0b118ded36e604db272e653f4e157f4ac285f7569ba0b1ce03f4d5490bfe40c87cce7b56a4831c46c56239bb2ceeaa47bda9d01f15bec174cf46c4bbee1f4e0d +SHA512 (gnome-commander-20240611T1445.tar.gz) = 1c423c940a5630a8875496e3dc0c278fc018b1660c6f8e69edf55f65ed8fe38fb3d85ee706d312edc4cac1b0fd6e0d50bb9f522d6274c1a50aff9382e70ee594 From 00050dfd6fd61652d6de9feb8e9986c85b063d6a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Jun 2024 12:25:28 +0900 Subject: [PATCH 16/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index eb477d7..b29f3ab 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240611 -%global gittartime 1445 -%global gitbaredate 20240610 -%global git_rev 2e447c53a664856c1e7778ddbff8de7611ab1ed1 +%global gittardate 20240613 +%global gittartime 1214 +%global gitbaredate 20240612 +%global git_rev 8b53d781339347496074d7dc28c2ca9b5bc4533b %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index e3b5d12..16e73bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240611T1445.tar.gz) = 1c423c940a5630a8875496e3dc0c278fc018b1660c6f8e69edf55f65ed8fe38fb3d85ee706d312edc4cac1b0fd6e0d50bb9f522d6274c1a50aff9382e70ee594 +SHA512 (gnome-commander-20240613T1214.tar.gz) = 25e48d41de5bbad43a30040a7d80dd64428a8ecaf31886bfa9940be76f5016f545b2d30666949efaad0f37ab4a8e8e93cf08aebc8f1fedf647204e5a2ec42fb3 From d80e29256823c2e4a3a97f6d144b095906d6c845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 14 Jun 2024 06:31:01 +0200 Subject: [PATCH 17/40] Rebuilt for exiv2 0.28.2 --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5838e11..4de5bed 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.2 -%global baserelease 1 +%global baserelease 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -288,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Fri Jun 14 2024 Robert-André Mauchin - 4:1.16.2-2 +- Rebuilt for exiv2 0.28.2 + * Mon May 20 2024 Mamoru TASAKA - 4:1.16.2-1 - 1.16.2 From 536463ceb2b6fc6701c1bfd5555c187f7916a25b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Jun 2024 11:11:08 +0900 Subject: [PATCH 18/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b29f3ab..23a62e2 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240613 -%global gittartime 1214 -%global gitbaredate 20240612 -%global git_rev 8b53d781339347496074d7dc28c2ca9b5bc4533b +%global gittardate 20240621 +%global gittartime 1048 +%global gitbaredate 20240615 +%global git_rev 126aff47c14f6b29be195f7270afe6b16484bb12 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 16e73bb..6de3444 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240613T1214.tar.gz) = 25e48d41de5bbad43a30040a7d80dd64428a8ecaf31886bfa9940be76f5016f545b2d30666949efaad0f37ab4a8e8e93cf08aebc8f1fedf647204e5a2ec42fb3 +SHA512 (gnome-commander-20240621T1048.tar.gz) = 14333a1fc9b208e6bc00d5bd51808dd9c46c5a3ae8c8b4689f194344b217085f60c3707adc42b4137bf79b58ccd86cc126443db162a0ea79a3fb028106ae13e4 From f08cae6f7739d4d8dd748189aff0af4dd962a78f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jun 2024 21:48:32 +0900 Subject: [PATCH 19/40] apply upstream 2 MR --- 118.patch | 55 ++++++++++++++++++++++++++ 119.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++ gnome-commander.spec | 8 +++- 3 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 118.patch create mode 100644 119.patch diff --git a/118.patch b/118.patch new file mode 100644 index 0000000..5906ae1 --- /dev/null +++ b/118.patch @@ -0,0 +1,55 @@ +From 488dc8587c43343bb655ae64dba5b0087962c955 Mon Sep 17 00:00:00 2001 +From: Andrey Kutejko +Date: Mon, 24 Jun 2024 23:47:07 +0200 +Subject: [PATCH] Use gtk_tree_iter_copy for allocating iterators + +--- + src/gnome-cmd-file-list.cc | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc +index f3da0dca..1c94fcfe 100644 +--- a/src/gnome-cmd-file-list.cc ++++ b/src/gnome-cmd-file-list.cc +@@ -2313,14 +2313,15 @@ GtkTreeIterPtr GnomeCmdFileList::get_focused_file_iter() + { + GtkTreePath *path = nullptr; + gtk_tree_view_get_cursor (*this, &path, NULL); +- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); ++ GtkTreeIter iter; + bool found = false; + if (path != nullptr) +- found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path); ++ found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); + gtk_tree_path_free (path); +- if (!found) +- iter.reset(); +- return iter; ++ if (found) ++ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); ++ else ++ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); + } + + +@@ -3514,11 +3515,12 @@ GtkTreeIterPtr GnomeCmdFileList::get_dest_row_at_coords (gdouble x, gdouble y) + if (!gtk_tree_view_get_dest_row_at_pos (*this, x, y, &path, nullptr)) + return GtkTreeIterPtr(nullptr, >k_tree_iter_free); + +- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); +- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path)) +- iter.reset(); ++ GtkTreeIter iter; ++ bool found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); + gtk_tree_path_free (path); +- +- return iter; ++ if (found) ++ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); ++ else ++ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); + } + +-- +GitLab + diff --git a/119.patch b/119.patch new file mode 100644 index 0000000..f326f85 --- /dev/null +++ b/119.patch @@ -0,0 +1,93 @@ +From dcc85a638fde158955f3ff54818a3d4a2fd79d54 Mon Sep 17 00:00:00 2001 +From: Andrey Kutejko +Date: Tue, 25 Jun 2024 00:13:31 +0200 +Subject: [PATCH] Sanitize stored tabs + +--- + src/gnome-cmd-data.cc | 2 ++ + src/gnome-cmd-main-win.cc | 28 +++++++++++++++------------- + 2 files changed, 17 insertions(+), 13 deletions(-) + +diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc +index 4146ce1c..a2eceb60 100644 +--- a/src/gnome-cmd-data.cc ++++ b/src/gnome-cmd-data.cc +@@ -1815,6 +1815,8 @@ static void save_tabs(GSettings *gSettings, const char *gSettingsKey) + + if (gnome_cmd_data.options.save_tabs_on_exit || (gnome_cmd_data.options.save_dirs_on_exit && fl == gnomeCmdFileSelector.file_list()) || fl->locked) + { ++ if (!fl->cwd) ++ continue; + gchar* uriString = GNOME_CMD_FILE (fl->cwd)->get_uri_str(); + if (!uriString) + continue; +diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc +index 238de96e..ddb49482 100644 +--- a/src/gnome-cmd-main-win.cc ++++ b/src/gnome-cmd-main-win.cc +@@ -907,6 +907,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + auto uriString = tab->first; + auto uriScheme = g_uri_peek_scheme (uriString.c_str()); + auto uriIsRelative = false; ++ gchar *path = nullptr; ++ GnomeCmdCon *con; + + if (!uriScheme) + { +@@ -917,8 +919,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + + if (strcmp(uriScheme, "file") == 0 || uriIsRelative) + { +- GnomeCmdCon *home = get_home_con (); +- gchar *path = nullptr; ++ con = get_home_con (); + if (uriIsRelative) + { + path = g_strdup(tab->first.c_str()); +@@ -928,16 +929,10 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, nullptr); + path = g_strdup(g_uri_get_path(gUri)); + } +- auto *gnomeCmdDir = gnome_cmd_dir_new (home, gnome_cmd_con_create_path (home, path), true); +- const auto& tabTuple = tab->second; +- +- fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); +- g_free(path); + } + else + { + GError *error = nullptr; +- gchar *path = nullptr; + auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, &error); + if (error) + { +@@ -948,14 +943,21 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + } + path = path ? path : g_strdup(g_uri_get_path(gUri)); + +- GnomeCmdConRemote *con = gnome_cmd_con_remote_new(nullptr, uriString); +- auto gnomeCmdPath = gnome_cmd_con_create_path((GnomeCmdCon*) con, path); +- auto gnomeCmdDir = gnome_cmd_dir_new((GnomeCmdCon*) con, gnomeCmdPath, true); +- const auto& tabTuple = tab->second; ++ con = (GnomeCmdCon*) gnome_cmd_con_remote_new(nullptr, uriString); ++ } + ++ GnomeCmdDir *gnomeCmdDir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, path), true); ++ if (gnomeCmdDir != nullptr) ++ { ++ const auto& tabTuple = tab->second; + fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); +- g_free(path); + } ++ else ++ { ++ g_warning("Stored path %s is invalid. Skipping", path); ++ } ++ ++ g_free(path); + } + } + +-- +GitLab + diff --git a/gnome-commander.spec b/gnome-commander.spec index 689bcb0..87b328a 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,6 +72,8 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +Patch118: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/118.patch +Patch119: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/119.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -190,6 +192,9 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +cat %PATCH118 | git am +cat %PATCH119 | git am + # Tweak samba detection sed -i meson.build \ -e 's|^\(samba = dependency\)|# \1|' \ @@ -197,6 +202,7 @@ sed -i meson.build \ %{nil} git commit -m "Tweak samba detection" -a + %if 0%{?use_gitbare} pushd .. %endif From d05ec99a874700011c533fbd331667c8f70d1c9b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Jun 2024 16:32:24 +0900 Subject: [PATCH 20/40] update to the latest git --- 118.patch | 55 -------------------------- 119.patch | 93 -------------------------------------------- gnome-commander.spec | 13 ++----- sources | 2 +- 4 files changed, 5 insertions(+), 158 deletions(-) delete mode 100644 118.patch delete mode 100644 119.patch diff --git a/118.patch b/118.patch deleted file mode 100644 index 5906ae1..0000000 --- a/118.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 488dc8587c43343bb655ae64dba5b0087962c955 Mon Sep 17 00:00:00 2001 -From: Andrey Kutejko -Date: Mon, 24 Jun 2024 23:47:07 +0200 -Subject: [PATCH] Use gtk_tree_iter_copy for allocating iterators - ---- - src/gnome-cmd-file-list.cc | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc -index f3da0dca..1c94fcfe 100644 ---- a/src/gnome-cmd-file-list.cc -+++ b/src/gnome-cmd-file-list.cc -@@ -2313,14 +2313,15 @@ GtkTreeIterPtr GnomeCmdFileList::get_focused_file_iter() - { - GtkTreePath *path = nullptr; - gtk_tree_view_get_cursor (*this, &path, NULL); -- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); -+ GtkTreeIter iter; - bool found = false; - if (path != nullptr) -- found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path); -+ found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); - gtk_tree_path_free (path); -- if (!found) -- iter.reset(); -- return iter; -+ if (found) -+ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); -+ else -+ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); - } - - -@@ -3514,11 +3515,12 @@ GtkTreeIterPtr GnomeCmdFileList::get_dest_row_at_coords (gdouble x, gdouble y) - if (!gtk_tree_view_get_dest_row_at_pos (*this, x, y, &path, nullptr)) - return GtkTreeIterPtr(nullptr, >k_tree_iter_free); - -- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); -- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path)) -- iter.reset(); -+ GtkTreeIter iter; -+ bool found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); - gtk_tree_path_free (path); -- -- return iter; -+ if (found) -+ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); -+ else -+ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); - } - --- -GitLab - diff --git a/119.patch b/119.patch deleted file mode 100644 index f326f85..0000000 --- a/119.patch +++ /dev/null @@ -1,93 +0,0 @@ -From dcc85a638fde158955f3ff54818a3d4a2fd79d54 Mon Sep 17 00:00:00 2001 -From: Andrey Kutejko -Date: Tue, 25 Jun 2024 00:13:31 +0200 -Subject: [PATCH] Sanitize stored tabs - ---- - src/gnome-cmd-data.cc | 2 ++ - src/gnome-cmd-main-win.cc | 28 +++++++++++++++------------- - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc -index 4146ce1c..a2eceb60 100644 ---- a/src/gnome-cmd-data.cc -+++ b/src/gnome-cmd-data.cc -@@ -1815,6 +1815,8 @@ static void save_tabs(GSettings *gSettings, const char *gSettingsKey) - - if (gnome_cmd_data.options.save_tabs_on_exit || (gnome_cmd_data.options.save_dirs_on_exit && fl == gnomeCmdFileSelector.file_list()) || fl->locked) - { -+ if (!fl->cwd) -+ continue; - gchar* uriString = GNOME_CMD_FILE (fl->cwd)->get_uri_str(); - if (!uriString) - continue; -diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc -index 238de96e..ddb49482 100644 ---- a/src/gnome-cmd-main-win.cc -+++ b/src/gnome-cmd-main-win.cc -@@ -907,6 +907,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - auto uriString = tab->first; - auto uriScheme = g_uri_peek_scheme (uriString.c_str()); - auto uriIsRelative = false; -+ gchar *path = nullptr; -+ GnomeCmdCon *con; - - if (!uriScheme) - { -@@ -917,8 +919,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - - if (strcmp(uriScheme, "file") == 0 || uriIsRelative) - { -- GnomeCmdCon *home = get_home_con (); -- gchar *path = nullptr; -+ con = get_home_con (); - if (uriIsRelative) - { - path = g_strdup(tab->first.c_str()); -@@ -928,16 +929,10 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, nullptr); - path = g_strdup(g_uri_get_path(gUri)); - } -- auto *gnomeCmdDir = gnome_cmd_dir_new (home, gnome_cmd_con_create_path (home, path), true); -- const auto& tabTuple = tab->second; -- -- fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -- g_free(path); - } - else - { - GError *error = nullptr; -- gchar *path = nullptr; - auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, &error); - if (error) - { -@@ -948,14 +943,21 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - } - path = path ? path : g_strdup(g_uri_get_path(gUri)); - -- GnomeCmdConRemote *con = gnome_cmd_con_remote_new(nullptr, uriString); -- auto gnomeCmdPath = gnome_cmd_con_create_path((GnomeCmdCon*) con, path); -- auto gnomeCmdDir = gnome_cmd_dir_new((GnomeCmdCon*) con, gnomeCmdPath, true); -- const auto& tabTuple = tab->second; -+ con = (GnomeCmdCon*) gnome_cmd_con_remote_new(nullptr, uriString); -+ } - -+ GnomeCmdDir *gnomeCmdDir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, path), true); -+ if (gnomeCmdDir != nullptr) -+ { -+ const auto& tabTuple = tab->second; - fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -- g_free(path); - } -+ else -+ { -+ g_warning("Stored path %s is invalid. Skipping", path); -+ } -+ -+ g_free(path); - } - } - --- -GitLab - diff --git a/gnome-commander.spec b/gnome-commander.spec index 87b328a..1b35b33 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240621 -%global gittartime 1048 -%global gitbaredate 20240615 -%global git_rev 126aff47c14f6b29be195f7270afe6b16484bb12 +%global gittardate 20240630 +%global gittartime 1624 +%global gitbaredate 20240628 +%global git_rev 6e48c6bd762540b408e1380714a098352f27bdea %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -72,8 +72,6 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -Patch118: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/118.patch -Patch119: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/119.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -192,9 +190,6 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -cat %PATCH118 | git am -cat %PATCH119 | git am - # Tweak samba detection sed -i meson.build \ -e 's|^\(samba = dependency\)|# \1|' \ diff --git a/sources b/sources index 6de3444..a35cfed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240621T1048.tar.gz) = 14333a1fc9b208e6bc00d5bd51808dd9c46c5a3ae8c8b4689f194344b217085f60c3707adc42b4137bf79b58ccd86cc126443db162a0ea79a3fb028106ae13e4 +SHA512 (gnome-commander-20240630T1624.tar.gz) = d23bf9ba70941ec7a54931ba5a8738cc5a7047bb84ad04bf64e81f537e7720f3c893459b5c612553523fdd1315f09a6b55e2bc8dd99fc43476325c4559e686a5 From e14fe4bc5e748a84905258d3d733edfb2967d4fb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 5 Jul 2024 10:56:59 +0900 Subject: [PATCH 21/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 1b35b33..b8c380f 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240630 -%global gittartime 1624 -%global gitbaredate 20240628 -%global git_rev 6e48c6bd762540b408e1380714a098352f27bdea +%global gittardate 20240705 +%global gittartime 1047 +%global gitbaredate 20240703 +%global git_rev fd91d7e1e5b9f3bd94cbed43175c20cf54d41f1d %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index a35cfed..8916f90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240630T1624.tar.gz) = d23bf9ba70941ec7a54931ba5a8738cc5a7047bb84ad04bf64e81f537e7720f3c893459b5c612553523fdd1315f09a6b55e2bc8dd99fc43476325c4559e686a5 +SHA512 (gnome-commander-20240705T1047.tar.gz) = 05502447f9cec18d2dc99a16adfb300ff5d73ed225cab76be3c096c197b1dff7b7dbf4c2dcd4c173e68be5f3fec2521140e3db7703e38129ae2057a13251df26 From 64e3118311276241cb4254647e03820d1dd528a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 8 Jul 2024 16:07:13 +0900 Subject: [PATCH 22/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b8c380f..cef1bc2 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240705 -%global gittartime 1047 -%global gitbaredate 20240703 -%global git_rev fd91d7e1e5b9f3bd94cbed43175c20cf54d41f1d +%global gittardate 20240708 +%global gittartime 1557 +%global gitbaredate 20240706 +%global git_rev 283ad970a1d6af9e1f6953c70651606510fef4be %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 8916f90..9fa6565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240705T1047.tar.gz) = 05502447f9cec18d2dc99a16adfb300ff5d73ed225cab76be3c096c197b1dff7b7dbf4c2dcd4c173e68be5f3fec2521140e3db7703e38129ae2057a13251df26 +SHA512 (gnome-commander-20240708T1557.tar.gz) = 9d77df7fc06ac435308bdd89be06b0def6c510da1caa6a51ca5d764ce6f4c0673da6a64f0a00952d06608ed6b68a809f2fcf43586eadb60e0c5357f959a701ce From 3f403af08a863f98cf1d13f5902ed15b29c05dcb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 9 Jul 2024 14:21:23 +0900 Subject: [PATCH 23/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index cef1bc2..3b997e4 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240708 -%global gittartime 1557 -%global gitbaredate 20240706 -%global git_rev 283ad970a1d6af9e1f6953c70651606510fef4be +%global gittardate 20240709 +%global gittartime 1416 +%global gitbaredate 20240708 +%global git_rev defc7b93d7a8d232fe2fbfa53e6b164567409f3f %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 9fa6565..287eb8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240708T1557.tar.gz) = 9d77df7fc06ac435308bdd89be06b0def6c510da1caa6a51ca5d764ce6f4c0673da6a64f0a00952d06608ed6b68a809f2fcf43586eadb60e0c5357f959a701ce +SHA512 (gnome-commander-20240709T1416.tar.gz) = 905a6081006011e161970032c353906b9a5c6e00a24c7101274b68fc6c0523aad0c2c86085ae42cd9bc3f9382ba50c4e174436b6b03bac6aa9170344406a5aaa From 877334a3410d24ee95d012ecef7e85acec042ee4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jul 2024 16:38:11 +0900 Subject: [PATCH 24/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 3b997e4..c8b14db 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240709 -%global gittartime 1416 -%global gitbaredate 20240708 -%global git_rev defc7b93d7a8d232fe2fbfa53e6b164567409f3f +%global gittardate 20240710 +%global gittartime 1629 +%global gitbaredate 20240709 +%global git_rev 6ff28fd978712f549ec23eecc80d51a2643291d6 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 287eb8f..9a7fb3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240709T1416.tar.gz) = 905a6081006011e161970032c353906b9a5c6e00a24c7101274b68fc6c0523aad0c2c86085ae42cd9bc3f9382ba50c4e174436b6b03bac6aa9170344406a5aaa +SHA512 (gnome-commander-20240710T1629.tar.gz) = 2b59d9f82bece898b6f331f0812066b14b603a9d74869620346cd61acce7e0f9cefaf65b91f356ef37a16d5d86f7527fafd59b21f47518993a11abe679571246 From e81cfc513184dee592167307c2be72149727b46c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Jul 2024 17:21:30 +0900 Subject: [PATCH 25/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index c8b14db..5abb593 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240710 -%global gittartime 1629 -%global gitbaredate 20240709 -%global git_rev 6ff28fd978712f549ec23eecc80d51a2643291d6 +%global gittardate 20240714 +%global gittartime 1714 +%global gitbaredate 20240713 +%global git_rev d1b8d3ffc8eef346dd3b3ba4117c2ebacf7f26b9 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 9a7fb3d..c015939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240710T1629.tar.gz) = 2b59d9f82bece898b6f331f0812066b14b603a9d74869620346cd61acce7e0f9cefaf65b91f356ef37a16d5d86f7527fafd59b21f47518993a11abe679571246 +SHA512 (gnome-commander-20240714T1714.tar.gz) = 54a6290c1aecfe6636b6a405ba9829b674e4c8be98361cd88b8310bb15c220e785737e72b3a010e481fa1a72e62b74afad04ba477097978473c1d5f3f90b9c04 From a46c64833a478aac83e5bb1a9d23de34603c25f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 16:52:30 +0900 Subject: [PATCH 26/40] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5abb593..ef5258a 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240714 -%global gittartime 1714 -%global gitbaredate 20240713 -%global git_rev d1b8d3ffc8eef346dd3b3ba4117c2ebacf7f26b9 +%global gittardate 20240715 +%global gittartime 1641 +%global gitbaredate 20240714 +%global git_rev 160607dbf9badadcd2697b594da32f0b06f8ef50 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index c015939..6801a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240714T1714.tar.gz) = 54a6290c1aecfe6636b6a405ba9829b674e4c8be98361cd88b8310bb15c220e785737e72b3a010e481fa1a72e62b74afad04ba477097978473c1d5f3f90b9c04 +SHA512 (gnome-commander-20240715T1641.tar.gz) = 181e262f693019c291eacd361448696f62292db26c18a8d4351157be85550c89faf10128748c0b99510a5816f95c617b37dd21f20d3d092ae87372d4f1326005 From fe54585ea4f075ad3c6ad44daff17bedd5896a6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:56:18 +0000 Subject: [PATCH 27/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 4de5bed..e09ea28 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.2 -%global baserelease 2 +%global baserelease 3 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -288,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4:1.16.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 14 2024 Robert-André Mauchin - 4:1.16.2-2 - Rebuilt for exiv2 0.28.2 From 6a56a5438f6a597f2952986c6bf307e31a4811c9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Jul 2024 16:45:00 +0900 Subject: [PATCH 28/40] update to the latest git --- gnome-commander.spec | 15 ++++----------- sources | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index ef5258a..4243e45 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240715 -%global gittartime 1641 -%global gitbaredate 20240714 -%global git_rev 160607dbf9badadcd2697b594da32f0b06f8ef50 +%global gittardate 20240721 +%global gittartime 1636 +%global gitbaredate 20240719 +%global git_rev 95c732e0bda821f4b1eb437d2bc175acd268c9c6 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -190,13 +190,6 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -# Tweak samba detection -sed -i meson.build \ - -e 's|^\(samba = dependency\)|# \1|' \ - -e 's|^\(have_samba = .*\)$|have_samba = true|' \ - %{nil} -git commit -m "Tweak samba detection" -a - %if 0%{?use_gitbare} pushd .. diff --git a/sources b/sources index 6801a58..ffcd346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240715T1641.tar.gz) = 181e262f693019c291eacd361448696f62292db26c18a8d4351157be85550c89faf10128748c0b99510a5816f95c617b37dd21f20d3d092ae87372d4f1326005 +SHA512 (gnome-commander-20240721T1636.tar.gz) = 06c7a6a4915f94d0272a2e60cb54017d9e0f827dd9d9119bb53c805f34d04bd9250734bc735a793e945b886524a2ee350d8fa5c75a4e3363e32c3f3bec6d10ee From d1ff84673a5d76478da81649eee7a74fd495e7f5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Jul 2024 15:36:47 +0900 Subject: [PATCH 29/40] prep: update to 0.18.0 --- gnome-commander.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 4243e45..7835c9d 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,10 +10,10 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force @@ -37,7 +37,7 @@ %global clamp_mtime_to_source_date_epoch 0 %endif -%global shortver 1.17 +%global shortver 1.18 %global fullver %{shortver}.0 %if 0%{?use_release} >= 1 @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 0%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -190,6 +190,18 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +# Tweak samba detection +sed -i meson.build \ + -e 's|^\(samba = dependency\)|# \1|' \ + -e 's|^\(have_samba = .*\)$|have_samba = true|' \ + %{nil} +git commit -m "Tweak samba detection" -a + +# Don't install unneeded files +sed -i doc/meson.build \ + -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ + %{nil} +git commit -m "Don't install header files, static archives, documentation" -a %if 0%{?use_gitbare} pushd .. From 42c8b2390a5b4fefbb43d608448012793c1b8c51 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Jul 2024 16:01:18 +0900 Subject: [PATCH 30/40] once save --- gnome-commander.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 2c9940e..a4f0545 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,7 +10,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global use_release 1 %global use_gitbare 0 @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 0%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -289,7 +289,7 @@ popd %{_datadir}/glib-2.0/schemas/org.gnome.*xml %dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.txt +#%%{_datadir}/%{name}/*.txt %{_datadir}/%{name}/icons/ %{_datadir}/applications/org.gnome.%{name}.desktop @@ -302,6 +302,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Jul 22 2024 Mamoru TASAKA - 4:1.18.0-1 +- 0.18.0 + * Thu Jul 18 2024 Fedora Release Engineering - 4:1.16.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c6a6b1968c0dc3715dcdb1a63fc965846665ede4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Jul 2024 16:47:53 +0900 Subject: [PATCH 31/40] once commit --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ffcd346..7c549a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240721T1636.tar.gz) = 06c7a6a4915f94d0272a2e60cb54017d9e0f827dd9d9119bb53c805f34d04bd9250734bc735a793e945b886524a2ee350d8fa5c75a4e3363e32c3f3bec6d10ee +SHA512 (gnome-commander-1.18.0.tar.xz) = 327c2046da4b27360b8fd85e58e5315abc10bf2a19ccb0cb8b4d3150d8de479a94adeeafcf812a61c98c96e3eb0343a8979c1077c2a585881746d66f3884e4cb From 31ba25663a5af0a31cd21320df6c95b2441ea3fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Jul 2024 15:40:19 +0900 Subject: [PATCH 32/40] Apply upstream PR for workaround for segfault with leaving tab pointing to invalid directory --- ...egfault-with-tab-pointing-to-invalid.patch | 52 +++++++++++++++++++ gnome-commander.spec | 8 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch diff --git a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch new file mode 100644 index 0000000..583cf29 --- /dev/null +++ b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch @@ -0,0 +1,52 @@ +From edd9f86713ca15ba9e9baeefbc282ddd00c8a6ff Mon Sep 17 00:00:00 2001 +From: gnome-commander Fedora maintainer + +Date: Tue, 23 Jul 2024 15:14:27 +0900 +Subject: [PATCH] Workaround for segfault with tab pointing to invalid + directory + +Workaround for +https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/151 +--- + src/gnome-cmd-main-win.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc +index 9eec172c..c1cc2dd2 100644 +--- a/src/gnome-cmd-main-win.cc ++++ b/src/gnome-cmd-main-win.cc +@@ -907,10 +907,13 @@ gboolean GnomeCmdMainWin::key_pressed(GnomeCmdKeyPress *event) + + void GnomeCmdMainWin::open_tabs(FileSelectorID id) + { +- if (gnome_cmd_data.tabs[id].empty()) ++ if (1 || gnome_cmd_data.tabs[id].empty()) + gnome_cmd_data.tabs[id].push_back(make_pair(string(g_get_home_dir ()), make_tuple(GnomeCmdFileList::COLUMN_NAME, GTK_SORT_ASCENDING, FALSE))); + + auto last_tab = unique(gnome_cmd_data.tabs[id].begin(), gnome_cmd_data.tabs[id].end()); ++ auto back_tab = gnome_cmd_data.tabs[id].end(); ++ --back_tab; ++ auto found_valid = false; + + for (auto tab=gnome_cmd_data.tabs[id].begin(); tab!=last_tab; ++tab) + { +@@ -920,6 +923,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + gchar *path = nullptr; + GnomeCmdCon *con; + ++ if ((tab == back_tab) && found_valid) continue; ++ + if (!uriScheme) + { + g_warning("Stored URI is either not absolute or invalid: %s", uriString.c_str()); +@@ -961,6 +966,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + { + const auto& tabTuple = tab->second; + fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); ++ found_valid = true; + } + else + { +-- +2.45.2 + diff --git a/gnome-commander.spec b/gnome-commander.spec index a4f0545..60abbfe 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,6 +72,7 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +Patch153: UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -189,6 +190,7 @@ git commit -m "base" -q git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +cat %PATCH153 | git am # Tweak samba detection sed -i meson.build \ @@ -302,6 +304,10 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2.san +- Apply upstream PR for workaround for segfault with leaving tab pointing to + invalid directory + * Mon Jul 22 2024 Mamoru TASAKA - 4:1.18.0-1 - 0.18.0 From 048e8fbb964f3dbddf4ddea4f3d67662f5f563e1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Jul 2024 15:40:30 +0900 Subject: [PATCH 33/40] kill asan --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 60abbfe..d09f179 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,7 +10,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 From 2af602367bf25d75a8698d87c9fe4815955531e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Aug 2024 13:53:44 +0900 Subject: [PATCH 34/40] 1.18.1 --- ...egfault-with-tab-pointing-to-invalid.patch | 52 ------------------- gnome-commander.spec | 11 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch diff --git a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch deleted file mode 100644 index 583cf29..0000000 --- a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From edd9f86713ca15ba9e9baeefbc282ddd00c8a6ff Mon Sep 17 00:00:00 2001 -From: gnome-commander Fedora maintainer - -Date: Tue, 23 Jul 2024 15:14:27 +0900 -Subject: [PATCH] Workaround for segfault with tab pointing to invalid - directory - -Workaround for -https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/151 ---- - src/gnome-cmd-main-win.cc | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc -index 9eec172c..c1cc2dd2 100644 ---- a/src/gnome-cmd-main-win.cc -+++ b/src/gnome-cmd-main-win.cc -@@ -907,10 +907,13 @@ gboolean GnomeCmdMainWin::key_pressed(GnomeCmdKeyPress *event) - - void GnomeCmdMainWin::open_tabs(FileSelectorID id) - { -- if (gnome_cmd_data.tabs[id].empty()) -+ if (1 || gnome_cmd_data.tabs[id].empty()) - gnome_cmd_data.tabs[id].push_back(make_pair(string(g_get_home_dir ()), make_tuple(GnomeCmdFileList::COLUMN_NAME, GTK_SORT_ASCENDING, FALSE))); - - auto last_tab = unique(gnome_cmd_data.tabs[id].begin(), gnome_cmd_data.tabs[id].end()); -+ auto back_tab = gnome_cmd_data.tabs[id].end(); -+ --back_tab; -+ auto found_valid = false; - - for (auto tab=gnome_cmd_data.tabs[id].begin(); tab!=last_tab; ++tab) - { -@@ -920,6 +923,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - gchar *path = nullptr; - GnomeCmdCon *con; - -+ if ((tab == back_tab) && found_valid) continue; -+ - if (!uriScheme) - { - g_warning("Stored URI is either not absolute or invalid: %s", uriString.c_str()); -@@ -961,6 +966,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - { - const auto& tabTuple = tab->second; - fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -+ found_valid = true; - } - else - { --- -2.45.2 - diff --git a/gnome-commander.spec b/gnome-commander.spec index d09f179..065c043 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,7 +72,6 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -Patch153: UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -190,7 +189,6 @@ git commit -m "base" -q git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -cat %PATCH153 | git am # Tweak samba detection sed -i meson.build \ @@ -304,7 +302,10 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog -* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2.san +* Thu Aug 01 2024 Mamoru TASAKA - 4:1.18.1-1 +- 1.18.1 + +* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2 - Apply upstream PR for workaround for segfault with leaving tab pointing to invalid directory diff --git a/sources b/sources index 7c549a8..4f65282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.0.tar.xz) = 327c2046da4b27360b8fd85e58e5315abc10bf2a19ccb0cb8b4d3150d8de479a94adeeafcf812a61c98c96e3eb0343a8979c1077c2a585881746d66f3884e4cb +SHA512 (gnome-commander-1.18.1.tar.xz) = 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e From 6ecc213f4733f49c1baa2847ea6134f1e8e17f10 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Sep 2024 16:23:29 +0900 Subject: [PATCH 35/40] Require gdk-pixbuf2-modules-extra when available --- gnome-commander.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 065c043..17c6b39 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -110,6 +110,9 @@ BuildRequires: pkgconfig(gtest) Requires: meld Requires: gnome-icon-theme-legacy +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description GNOME Commander is a nice and fast file manager for the GNOME desktop. @@ -302,6 +305,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Sep 15 2024 Mamoru TASAKA - 4:1.18.1-2 +- Require gdk-pixbuf2-modules-extra when available + * Thu Aug 01 2024 Mamoru TASAKA - 4:1.18.1-1 - 1.18.1 From 33b6312d3ee8a599ca078c49dca7608033ae2625 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:38:05 +0000 Subject: [PATCH 36/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 17c6b39..b1d3b69 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 3%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -305,6 +305,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4:1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Sep 15 2024 Mamoru TASAKA - 4:1.18.1-2 - Require gdk-pixbuf2-modules-extra when available From 79ceb7d10e004b73e83d047115a546afccaed41e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Feb 2025 23:09:23 +0900 Subject: [PATCH 37/40] 1.18.2 --- gnome-commander.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b1d3b69..a247921 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.1 +%global fullver %{shortver}.2 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 3%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -111,6 +111,7 @@ BuildRequires: pkgconfig(gtest) Requires: meld Requires: gnome-icon-theme-legacy %if 0%{?fedora} >= 41 +BuildRequires: gdk-pixbuf2-modules-extra Requires: gdk-pixbuf2-modules-extra%{?_isa} %endif @@ -305,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Feb 10 2025 Mamoru TASAKA - 4:1.18.2-1 +- 1.18.2 + * Thu Jan 16 2025 Fedora Release Engineering - 4:1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 4f65282..7a18b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.1.tar.xz) = 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e +SHA512 (gnome-commander-1.18.2.tar.xz) = dce4af0f0e664b0bb835839f2f465ce5cb34bef8e73bb34b6016fad0f1e79232daa149897da2cafe32450ce5853e27eed6ceaac2284d580709a27c2926249911 From e25944d21375571f2ea886c2bf8cff285ac81f83 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 Jun 2025 11:11:39 +0900 Subject: [PATCH 38/40] 1.18.3 --- gnome-commander.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a247921..51192eb 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.2 +%global fullver %{shortver}.3 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jun 26 2025 Mamoru TASAKA - 4:1.18.3-1 +- 1.18.3 + * Mon Feb 10 2025 Mamoru TASAKA - 4:1.18.2-1 - 1.18.2 diff --git a/sources b/sources index 7a18b69..8f12001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.2.tar.xz) = dce4af0f0e664b0bb835839f2f465ce5cb34bef8e73bb34b6016fad0f1e79232daa149897da2cafe32450ce5853e27eed6ceaac2284d580709a27c2926249911 +SHA512 (gnome-commander-1.18.3.tar.xz) = 72dad0cf73c94293c382eaacd2ea6172539cd2ee6534d48c58b2f74166caddd633a88cae6ca8bd6271522d037919a91f1291fbd1ccc3493004ed67f0d7081bed From 3e1c033a50fdd94c5948e4e3136fa9635fe69bd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:40:17 +0000 Subject: [PATCH 39/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 51192eb..a75ce6e 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4:1.18.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 26 2025 Mamoru TASAKA - 4:1.18.3-1 - 1.18.3 From bbe02043e18341f0bec74108c85906cf8ed26cc2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Oct 2025 23:31:15 +0900 Subject: [PATCH 40/40] 1.18.4 --- gnome-commander.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a75ce6e..19979f7 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.3 +%global fullver %{shortver}.4 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Oct 02 2025 Mamoru TASAKA - 4:1.18.4-1 +- 1.18.4 + * Wed Jul 23 2025 Fedora Release Engineering - 4:1.18.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 8f12001..d5cd8e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.3.tar.xz) = 72dad0cf73c94293c382eaacd2ea6172539cd2ee6534d48c58b2f74166caddd633a88cae6ca8bd6271522d037919a91f1291fbd1ccc3493004ed67f0d7081bed +SHA512 (gnome-commander-1.18.4.tar.xz) = 54966719e63a4ca6c9d24cbd1f69dbadd4ac0b7588c2cd1a34635deafcab5976d9e82fdcf6dbc0dc7f1098a25443c9eeaa2400db192b487b6d92d62f62ee23db