From f948953a477537ddc351c96c223839c1c208043f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Feb 2022 15:31:01 +0900 Subject: [PATCH] 1.14.0 --- .gitignore | 50 ++------------------------------------------ gnome-commander.spec | 27 ++++++++++++------------ sources | 2 +- 3 files changed, 16 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 456d133..852717d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,2 @@ -gnome-commander-1.2.8.6.tar.bz2 -gnome-commander-1.2.8.7.tar.bz2 -/gnome-commander-1.2.8.8.tar.bz2 -/gnome-commander-1.2.8.9.tar.bz2 -/gnome-commander-1.2.8.10.tar.bz2 -/gnome-commander-1.2.8.11.tar.bz2 -/gnome-commander-1.2.8.12.tar.bz2 -/gnome-commander-1.2.8.13.tar.bz2 -/gnome-commander-1.2.8.14.tar.bz2 -/gnome-commander-1.2.8.15.tar.xz -/gnome-commander-1.2.8.16.tar.xz -/gnome-commander-1.2.8.17.tar.xz -/gnome-commander-1.4.0.tar.xz -/gnome-commander-1.4.1.tar.xz -/gnome-commander-1.4.2.tar.xz -/gnome-commander-1.4.3.tar.xz -/gnome-commander-1.4.4.tar.xz -/gnome-commander-1.4.5.tar.xz -/gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz -/gnome-commander-1.4.6.tar.xz -/gnome-commander-1.4.7.tar.xz -/gnome-commander-1.4.8.tar.xz -/gnome-commander-1.4.9.tar.xz -/gnome-commander-1.6.0.tar.xz -/gnome-commander-1.6.1.tar.xz -/gnome-commander-1.6.2.tar.xz -/gnome-commander-1.6.3.tar.xz -/gnome-commander-1.6.4.tar.xz -/gnome-commander-1.8.0.tar.xz -/gnome-commander-1.8.1.tar.xz -/gnome-commander-1.10.0.tar.xz -/gnome-commander-1.10.1.tar.xz -/gnome-commander-1.10.2.tar.xz -/gnome-commander-1.10.3.tar.xz -/gnome-commander-20210319T1025.tar.gz -/gnome-commander-1.12.0.tar.xz -/gnome-commander-1.12.1.tar.xz -/gnome-commander-1.12.2.tar.xz -/gnome-commander-1.12.3.tar.xz -/gnome-commander-1.12.3.1.tar.xz -/gnome-commander-20211118T1354.tar.gz -/gnome-commander-20211118T2218.tar.gz -/gnome-commander-20211121T1604.tar.gz -/gnome-commander-20211124T2228.tar.gz -/gnome-commander-20211129T1620.tar.gz -/gnome-commander-20211207T1450.tar.gz -/gnome-commander-20211227T1536.tar.gz -/gnome-commander-20220113T1526.tar.gz +/gnome-commander-*.tar.gz +/gnome-commander-*.tar.xz diff --git a/gnome-commander.spec b/gnome-commander.spec index a45a633..4c66e4c 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,10 +13,10 @@ %global update_po 0 %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 @@ -39,9 +39,9 @@ %global if_pre 1 %endif -%global shortver 1.12 -%global fullver %{shortver}.3.1 -%global mainrel 3 +%global shortver 1.14 +%global fullver %{shortver}.0 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -86,8 +86,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 -# Must send to be upstream -Patch101: 0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -221,8 +219,6 @@ git commit -m "base" -q %patch1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} -# Already fixed in git master -cat %PATCH101 | git am %endif %if 0%{use_autotool} > 0 @@ -329,7 +325,7 @@ desktop-file-install \ --vendor '' \ --remove-category Application \ --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}.desktop + %{buildroot}%{_datadir}/applications/org.gnome.%{name}.desktop # Install wrapper %{__mkdir_p} %{buildroot}%{_bindir} @@ -351,7 +347,7 @@ popd %find_lang %{name} %check -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.%{name}.appdata.xml %if 0%{?use_gitbare} pushd %{name} @@ -380,8 +376,8 @@ popd %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* -%{_datadir}/applications/%{name}.desktop -%{_metainfodir}/%{name}.appdata.xml +%{_datadir}/applications/org.gnome.%{name}.desktop +%{_metainfodir}/org.gnome.%{name}.appdata.xml %{_datadir}/help/*/%{name}/ @@ -391,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Feb 6 2022 Mamoru TASAKA - 4:1.14.0-1 +- 1.14.0 + * Mon Nov 22 2021 Mamoru TASAKA - 4:1.12.3.1-2 - Fix crash when saving device information on preference diff --git a/sources b/sources index b7422f8..cae01b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20220113T1526.tar.gz) = c97101f1905bd24ff206882d12eff40d771b0ee53a5007555ae462d48a3520a0598ed61f95a71d22133c5666f00ed110aa7c6e4d4d28691f80ba473453b453c1 +SHA512 (gnome-commander-1.14.0.tar.xz) = 769f1272331ed71f558b87a73a920b9bfd5a2ea2af66972bdcac44d7a7623a6cb32460b0b650bd26d07c27bdc8b71c7d8bc2038076778aa356b638c4765ce4a5