diff --git a/.gitignore b/.gitignore index 4cd49e4..c8e6cfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ catfish-0.3.2.tar.gz /catfish-0.4.0.2.tar.bz2 +/catfish-0.6.4.tar.bz2 diff --git a/catfish-0.4.0-stock-info.patch b/catfish-0.4.0-stock-info.patch deleted file mode 100644 index 0ab3e98..0000000 --- a/catfish-0.4.0-stock-info.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: catfish-0.4.0.2/catfish.py -=================================================================== ---- catfish-0.4.0.2.orig/catfish.py -+++ catfish-0.4.0.2/catfish.py -@@ -1103,7 +1103,7 @@ class catfish: - _('Click here to start the search daemon.')), - 'daemon:' + daemon + '']) - else: -- status_icon = Gtk.STOCK_INFO -+ status_icon = Gtk.STOCK_DIALOG_INFO - messages.append([_('No files were found.'), None]) - status = _('No files found.') - else: -@@ -1387,7 +1387,7 @@ class catfish: - action = re.sub('<[^>]+>', '', action) - action_name, action_value = action.split(':') - subprocess.Popen([action_value]) -- icon, message = Gtk.STOCK_INFO, _('The search daemon was started.') -+ icon, message = Gtk.STOCK_DIALOG_INFO, _('The search daemon was started.') - except Exception, msg: - if self.options.debug: print 'Debug:', msg - icon, message = (Gtk.STOCK_CANCEL -@@ -1529,7 +1529,7 @@ class catfish: - listmodel.append(filegroup[4]) - if len(listmodel) == 0: - self.clear_deepsearch = True -- status_icon = Gtk.STOCK_INFO -+ status_icon = Gtk.STOCK_DIALOG_INFO - messages.append([_('No files were found.'), None]) - status = _('No files found.') - else: diff --git a/catfish-0.4.0.2-GError.patch b/catfish-0.4.0.2-GError.patch deleted file mode 100644 index e9adbfe..0000000 --- a/catfish-0.4.0.2-GError.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- catfish-0.4.0.2/catfish.py.GError 2013-07-01 16:06:08.193254698 +0900 -+++ catfish-0.4.0.2/catfish.py 2013-07-01 13:58:58.328273886 +0900 -@@ -21,7 +21,7 @@ - - import locale, gettext - from gi.repository import GObject, Gtk, Gdk, GdkPixbuf, Pango -- from gi._glib import GError -+ from gi.repository.GLib import GError - - except ImportError, msg: - print 'Error: The required module %s is missing.' % str(msg).split()[-1] diff --git a/catfish-0.4.0.2-loopiter.patch b/catfish-0.4.0.2-loopiter.patch deleted file mode 100644 index fe5f94e..0000000 --- a/catfish-0.4.0.2-loopiter.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- catfish-0.4.0.2/catfish.py.loopiter 2013-07-01 13:58:58.328273886 +0900 -+++ catfish-0.4.0.2/catfish.py 2013-07-01 15:18:51.892475084 +0900 -@@ -1205,6 +1205,8 @@ - pass - self.suggestion_pending = False - yield False -+ else: -+ yield False - - def disable_filters(self): - self.time_filter_any.set_active(True) diff --git a/catfish.spec b/catfish.spec index 8d003d6..fdc2235 100644 --- a/catfish.spec +++ b/catfish.spec @@ -1,46 +1,36 @@ -%global majorver 0.4 -%define mainver 0.4.0.2 +%global majorver 0.6 +%define mainver 0.6.4 %undefine betaver -%define fedoraver 3 +%define fedoraver 1 Name: catfish Version: %{mainver} -Release: %{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist} Summary: A handy file search tool Group: Applications/File License: GPLv2+ URL: https://launchpad.net/catfish-search Source0: https://launchpad.net/catfish-search/%{majorver}/%{mainver}/+download/%{name}-%{mainver}%{?betaver}.tar.bz2 -# Don't use missing gtk.STOCK_INFO (bug 753512) -### TODO: -# the consuming code has moved from pygtk to gi.repository in the -# pygobject3 package. Review if this patch is still necessary -Patch0: catfish-0.4.0-stock-info.patch -# Fix GError module error on launch (bug 964356) -Patch1: catfish-0.4.0.2-GError.patch -# Fix infinite loop when searching words with asterisk (bug 964356) -Patch2: catfish-0.4.0.2-loopiter.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: gettext # python related Requires: pygobject3 -Requires: pyxdg -Requires: dbus-python +Requires: xdg-utils # search engine Requires: %{_bindir}/locate -Requires: %{_bindir}/find # icon # Requires: redhat-artwork # Upstream rename Obsoletes: search4files <= 0.2a Provides: search4files = %{version}-%{release} +# Obsolete old search engine subpackage +Obsoletes: catfish-engines <= 0.6 %description A handy file search tool using different backends which is @@ -50,63 +40,37 @@ This program acts as a frontend for different file search engines. The interface is intentionally lightweight and simple. But it takes configuration options from the command line. -%package engines -Summary: Metapackage to install all supported engines -Group: Applications/File -License: GPLv2+ - -Requires: %{name} = %{version}-%{release} -#Requires: beagle -Requires: doodle -%if 0%{?fedora} >= 8 -#Requires: pinot -%endif -Requires: strigi -Requires: tracker - -%description engines -This is a metapackage to install all engines supported by %{name}. - %prep %setup -q -n %{name}-%{mainver}%{?betaver} -%patch0 -p1 -b .info -%patch1 -p1 -b .GError -%patch2 -p1 -b .loopiter # Fix up permissions... -%{__chmod} 0644 \ - po/* \ - [A-Z]* \ - catfish* +find . -type f -print0 | xargs --null chmod 0644 +chmod 0755 \ + configure \ + build.py %build # Some configulation changes # # msgfmt is fixed. -# Linking is still broken... %{__sed} -i.misc \ - -e '/svg/s|install|install -m 644|' \ - -e '/glade/s|install| install -m 644|' \ - -e 's|install |install -p |' \ - -e 's|pyc|py|' \ - -e 's|^\([ \t]*\)ln |\1: ln |' \ + -e '\@catfish/@s|install|install -p -m 644|' \ + -e '\@catfish_lib/@s|install|install -p -m 644|' \ + -e '\@data/@s|install|install -p -m 644|' \ + -e '\@install .*-d@s|644|755|' \ -e 's|cp -rf|cp -prf|' \ - Makefile.in + Makefile.in.in %{__sed} -i.byte \ -e 's|pyc|py|' \ - %{name}.in - -%{__sed} -i.engine \ - -e 's|Nautilus|nautilus|' \ - %{name}.py + bin/%{name}.in.in # This configure accepts only the option --prefix # and does not accept --libdir= option -./configure --prefix=%{_prefix} +./configure \ + --prefix=%{_prefix} \ + --python=python2 %install -%{__rm} -rf $RPM_BUILD_ROOT - %{__make} install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ @@ -120,17 +84,8 @@ desktop-file-install \ # Remove all unnecessary documentation %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/doc/ -# and.. manually link.. -%{__ln_s} -f ../icons/hicolor/scalable/apps/%{name}.svg \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/ -%{__ln_s} -f ../locale/ \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/ - %{find_lang} %{name} -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -152,10 +107,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%files engines -%defattr(-,root,root,-) - %changelog +* Fri Aug 16 2013 Mamoru TASAKA - 0.6.4-1 +- 0.6.4 + * Sat Aug 03 2013 Fedora Release Engineering - 0.4.0.2-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 49eff7e..08e5ddd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d80eb544a12dbee2b2c84b63c4903eea catfish-0.4.0.2.tar.bz2 +0add5dacbf0b84fd92c718ef12fd1542 catfish-0.6.4.tar.bz2