diff --git a/.gitignore b/.gitignore index a759896..c535436 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ catfish-0.3.2.tar.gz /catfish-1.4.10.tar.bz2 /catfish-1.4.11.tar.bz2 /catfish-1.4.13.tar.bz2 +/catfish-4.15.0.tar.bz2 diff --git a/0001-Support-python-3.9-and-drop-support-python-3.2.patch b/0001-Support-python-3.9-and-drop-support-python-3.2.patch deleted file mode 100644 index a84ed91..0000000 --- a/0001-Support-python-3.9-and-drop-support-python-3.2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 080ee441563b2ecb1ee5012b0885f2c9af51beb2 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Thu, 1 Oct 2020 00:29:31 +0900 -Subject: [PATCH] Support python 3.9 and drop support python < 3.2 - -python 3.9 removes getiterator() of classes ElementTree , which are -obsoleted from python 3.2: -https://docs.python.org/3.9/whatsnew/3.9.html#removed - -Change getiterator() to iter() introduced in python 3.2, and because of -this, drop support python < 3.2. ---- - catfish_lib/Builder.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/catfish_lib/Builder.py b/catfish_lib/Builder.py -index 9c8d478..5e74dcb 100644 ---- a/catfish_lib/Builder.py -+++ b/catfish_lib/Builder.py -@@ -84,7 +84,7 @@ class Builder(Gtk.Builder): - tree = ElementTree() - tree.parse(filename) - -- ele_widgets = tree.getiterator("object") -+ ele_widgets = tree.iter("object") - for ele_widget in ele_widgets: - try: - name = ele_widget.attrib['id'] -@@ -109,7 +109,7 @@ class Builder(Gtk.Builder): - if connections: - self.connections.extend(connections) - -- ele_signals = tree.getiterator("signal") -+ ele_signals = tree.iter("signal") - for ele_signal in ele_signals: - self.glade_handler_dict.update( - {ele_signal.attrib["handler"]: None}) --- -2.28.0 - diff --git a/0002-Fix-python-crash-when-some-extension-scheme-is-used.patch b/0002-Fix-python-crash-when-some-extension-scheme-is-used.patch deleted file mode 100644 index a3df69f..0000000 --- a/0002-Fix-python-crash-when-some-extension-scheme-is-used.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 155895dec221a8a7d69bbae132404a1628e93dbb Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Thu, 1 Oct 2020 10:24:58 +0900 -Subject: [PATCH] Fix python crash when some extension scheme is used. - -When some extension scheme is specified for the folder to search files, -gtk_file_chooser_get_filename() can return empty string. -Fix crash when such schema is used. ---- - catfish/CatfishSearchEngine.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/catfish/CatfishSearchEngine.py b/catfish/CatfishSearchEngine.py -index 9d7ff64..5033671 100644 ---- a/catfish/CatfishSearchEngine.py -+++ b/catfish/CatfishSearchEngine.py -@@ -169,6 +169,11 @@ class CatfishSearchEngine: - else: - keys.append(key) - -+ # path may be empty when some "extension" scheme is used in URL -+ if not path: -+ self.stop() -+ return -+ - # For simplicity, make sure the path contains a trailing '/' - if not path.endswith('/'): - path += '/' --- -2.28.0 - diff --git a/catfish.spec b/catfish.spec index 24e3f34..fc5294a 100644 --- a/catfish.spec +++ b/catfish.spec @@ -3,11 +3,11 @@ Requires: %1 \ BuildRequires: %1 \ %{nil} -%global majorver 1.4 -%define mainver 1.4.13 +%global majorver 4.15 +%define mainver 4.15.0 %undefine betaver -%define fedoraver 2 +%define fedoraver 1 Name: catfish Version: %{mainver} @@ -16,13 +16,7 @@ Summary: A handy file search tool License: GPLv2+ URL: https://docs.xfce.org/apps/catfish/start -Source0: https://archive.xfce.org/src/apps/catfish/1.4/catfish-%{version}%{?betaver}.tar.bz2 -# https://gitlab.xfce.org/apps/catfish/-/issues/33 -# Currently under review -Patch1: 0001-Support-python-3.9-and-drop-support-python-3.2.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1883688 -# https://gitlab.xfce.org/apps/catfish/-/issues/35 -Patch2: 0002-Fix-python-crash-when-some-extension-scheme-is-used.patch +Source0: https://archive.xfce.org/src/apps/catfish/%{majorver}/catfish-%{version}%{?betaver}.tar.bz2 BuildArch: noarch BuildRequires: desktop-file-utils @@ -36,16 +30,10 @@ BuildRequires: %{_bindir}/appstream-util %BothRequires python3-gobject %BothRequires python3-pexpect -%BothRequires python3-dbus +%BothRequires python3-dbus -%if 0%{?fedora} < 33 -Obsoletes: python2-%{name} < 1.4.5-2 -Obsoletes: python-%{name} < 1.4.5-2 -Obsoletes: %{name}-python3 < 1.4.5-2 -Obsoletes: %{name}-common < 1.4.5-2 -Provides: %{name}-python3 = %{version}-%{release} -Provides: %{name}-common = %{version}-%{release} -%endif +# gobject introspection +Requires: xfconf Requires: xdg-utils # search engine @@ -68,8 +56,6 @@ options. %setup -q -T -c -a 0 %{name}-%{mainver}%{?betaver} pushd %{name}-%{mainver}* -%patch1 -p1 -%patch2 -p1 # Fix up permissions... find . -type f -print0 | xargs --null chmod 0644 @@ -151,8 +137,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %files -f %{name}.lang %doc AUTHORS -%doc ChangeLog -%doc README +%doc NEWS +%doc README.md %license COPYING %{_bindir}/%{name} %{_bindir}/%{name}-py3 @@ -163,7 +149,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_mandir}/man1/%{name}.1* %{_datadir}/%{name}/ -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/icons/hicolor/*/apps/org.xfce.%{name}.* %{_datadir}/applications/%{name}.desktop %{_metainfodir}/%{name}.appdata.xml %{python3_sitelib}/%{name}/ @@ -172,6 +158,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Oct 27 2020 Mamoru TASAKA - 4.15.0-1 +- 4.15.0 (versioning scheme changed) + * Thu Oct 1 2020 Mamoru TASAKA - 1.4.13-2 - Fix crash when some extensional scheme (supported by Thunar, PcmanFM, for example) is used (bug 1883688) diff --git a/sources b/sources index f4f899a..b8b0c49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (catfish-1.4.13.tar.bz2) = a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886 +SHA512 (catfish-4.15.0.tar.bz2) = d2415194e3d803a99b1a0d80763db6f4e95c810d2bc679057e54105bb906ec1a0de32b64d8c0b2a36aad11d689401111c3466b1e8ad41760f4d6b67f979a81a3