From 0618906467a68ae3dcac17f137a41f9cb7583a21 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Jul 29 2022 06:44:44 +0000
Subject: 4.16.4


---

diff --git a/.gitignore b/.gitignore
index 31fd6fb..198c0ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1 @@
-catfish-0.3.2.tar.gz
-/catfish-0.4.0.2.tar.bz2
-/catfish-0.6.4.tar.bz2
-/catfish-0.8.2.tar.bz2
-/catfish-1.0.0.tar.bz2
-/catfish-1.0.1.tar.bz2
-/catfish-1.0.2.tar.bz2
-/catfish-1.0.3.tar.bz2
-/catfish-1.2.1.tar.bz2
-/catfish-1.2.2.tar.bz2
-/catfish-1.3.2.tar.bz2
-/catfish-1.3.3.tar.bz2
-/catfish-1.3.4.tar.bz2
-/catfish-1.4.1.tar.bz2
-/catfish-1.4.2.tar.bz2
-/catfish-1.4.4.tar.gz
-/catfish-1.4.5.tar.gz
-/catfish-1.4.7.tar.bz2
-/catfish-1.4.8.tar.bz2
-/catfish-1.4.10.tar.bz2
-/catfish-1.4.11.tar.bz2
-/catfish-1.4.13.tar.bz2
-/catfish-4.15.0.tar.bz2
-/catfish-4.16.0.tar.bz2
-/catfish-4.16.1.tar.bz2
-/catfish-4.16.2.tar.bz2
-/catfish-4.16.3.tar.bz2
+/catfish-*.bz2
diff --git a/catfish-4.16.3-0001-get_exo_preferred_file_manager-check-if-the-requeste.patch b/catfish-4.16.3-0001-get_exo_preferred_file_manager-check-if-the-requeste.patch
deleted file mode 100644
index 49b2077..0000000
--- a/catfish-4.16.3-0001-get_exo_preferred_file_manager-check-if-the-requeste.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c958f2eb95a144ecbfcf3b7f18614fab553a0186 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Sun, 3 Oct 2021 23:21:09 +0900
-Subject: [PATCH] get_exo_preferred_file_manager: check if the requested key
- exists before actually use it
-
-In get_exo_preferred_file_manager(), when ~/.config/xfce4/helpers.rc exists,
-this function gets application settings from this file, then tries to use
-the value for "FileManager" key.
-
-However in some cases (for example, using `$ xfce4-mime-settings`, changing
-"Terminal Emulator" only), this rc file does not contain "FileManager" key.
-Currently in this case, catfish gets traceback.
-
-To fix this, check if "FileManager" key exists before actually using it.
-
-Closes #64 .
----
- catfish/CatfishWindow.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
-index c199353..3d855d0 100644
---- a/catfish/CatfishWindow.py
-+++ b/catfish/CatfishWindow.py
-@@ -1213,16 +1213,16 @@ class CatfishWindow(Window):
-             cfg = "%s/xfce4/helpers.rc" % config_dir
-             if os.path.exists(cfg):
-                 apps = self.get_exo_preferred_applications(cfg)
--                if 'custom-FileManager' in apps['FileManager']:
--                    with open(custFM) as f:
--                        for line in f:
--                            CFM = line.replace('X-XFCE-Commands=', '').strip()
--                            if 'X-XFCE-Commands=' in line:
--                                return CFM
--
-                 if 'FileManager' in apps:
-+                    if 'custom-FileManager' in apps['FileManager']:
-+                        with open(custFM) as f:
-+                            for line in f:
-+                                CFM = line.replace('X-XFCE-Commands=', '').strip()
-+                                if 'X-XFCE-Commands=' in line:
-+                                    return CFM
-                     return apps['FileManager']
- 
-+
-         return "Thunar"
- 
-     def using_thunar_fm(self):
--- 
-2.32.0
-
diff --git a/catfish.spec b/catfish.spec
index c6dffe7..239cbf4 100644
--- a/catfish.spec
+++ b/catfish.spec
@@ -9,25 +9,20 @@ BuildRequires:  %1 \
 %endif
 
 %global		majorver	4.16
-%define		mainver		4.16.3
+%define		mainver		4.16.4
 %undefine		betaver		
 
-%define		fedoraver	2
+%define		fedoraver	1
 
 Name:		catfish
 Version:	%{mainver}
-Release:	%{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist}.3
+Release:	%{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist}
 Summary:	A handy file search tool
 
 License:	GPLv2+
 URL:		https://docs.xfce.org/apps/catfish/start
 Source0:	https://archive.xfce.org/src/apps/catfish/%{majorver}/catfish-%{version}%{?betaver}.tar.bz2
 BuildArch:	noarch
-# https://bugzilla.redhat.com/show_bug.cgi?id=2009994
-# https://gitlab.xfce.org/apps/catfish/-/issues/64
-# https://gitlab.xfce.org/apps/catfish/-/merge_requests/41
-# get_exo_preferred_file_manager: check if the requested key exists before actually use it
-Patch1:	catfish-4.16.3-0001-get_exo_preferred_file_manager-check-if-the-requeste.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -76,8 +71,6 @@ options.
 %setup -q -T -c -a 0 %{name}-%{mainver}%{?betaver}
 pushd %{name}-%{mainver}*
 
-%patch1 -p1 -b .exo
-
 # Fix up permissions...
 find . -type f -print0 | xargs --null chmod 0644
 chmod 0755 bin/%{name}
@@ -182,6 +175,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 
 
 %changelog
+* Fri Jul 29 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.16.4-1
+- 4.16.4
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.3-2.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index fd19758..3c9e322 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (catfish-4.16.3.tar.bz2) = 23ffa160b0593033a9696644fd00c48e4a6f54dc25448f975f0949aece50d8e4fbb45b9ad086a8e14072ac1dab27e0b4ecd19af0f31a5b4a775b17e18b00c7bb
+SHA512 (catfish-4.16.4.tar.bz2) = 729359e737d5faf8a97caf82d1bc709be46baf76d93f0a7007e27fa96d3f2dfe9e2c316cdba991a38c5333db26c37f18cc4ca7f8468087cad754d44bd1e2677c