From 64f7a8f6ee3564d9df76646b00e3ddf0073f9390 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jan 22 2007 18:30:57 +0000
Subject: - 0.2c


---

diff --git a/.cvsignore b/.cvsignore
index fc50c38..7bbc087 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-catfish0.2b.tar.gz
+catfish-0.2c.tar.gz
diff --git a/catfish.spec b/catfish.spec
index 89cba3a..c65ac30 100644
--- a/catfish.spec
+++ b/catfish.spec
@@ -1,16 +1,17 @@
 Name:		catfish
-Version:	0.2b
+Version:	0.2c
 Release:	1%{?dist}
 Summary:	A handy file search tool
 
 Group:		Applications/File
 License:	GPL
-URL:		http://software.twotoasts.de/?page=catfish
-Source0:	http://software.twotoasts.de/media/%{name}/%{name}%{version}.tar.gz
+URL:		http://software.twotoasts.de/?page=search4files
+Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 # python related
 Requires:	pygtk2-libglade
 Requires:	pyxdg
@@ -33,15 +34,22 @@ The interface is intentionally lightweight and simple. But it takes
 configuration options from the command line.
 
 %prep
-%setup -q -n %{name}%{version}
+%setup -q
 
 %build
-# some configulation change
+# Some configulation change
+# Important note: Upstream removed DESTDIR option, however
+# this Makefile.in won't work without DESTDIR!!
 %{__sed} -i.misc \
 	-e 's|666|644|' \
+	-e '/svg/s|install|install -m 644|' \
 	-e 's|install |%{__install} -c -p |' \
 	-e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \
 	-e 's|pyc|py|' \
+	-e 's|^\([ \t]*\)ln |\1: ln |' \
+	-e '/install/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \
+	-e '/cp/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \
+	-e 's|cp -rf|cp -prc|' \
 	Makefile.in
 
 %{__sed} -i.byte \
@@ -56,13 +64,18 @@ configuration options from the command line.
 # and does not accept --libdir= option
 ./configure --prefix=%{_prefix}
 
+# Create gettext .mo files manually for now as
+# Makefile.in does not work
+for pofile in i18n/*.po ; do
+	lang=`basename $pofile | sed -e 's|\.po$||'`
+	dir=locale/${lang}/LC_MESSAGES
+	%{__mkdir_p} $dir
+	msgfmt -v --statistics $pofile -o $dir/%{name}.mo
+done
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# "make install" calls "make all", so
-#  executing "make" in %%build stage makes no sense
-#  at all.
-# %%{__smp_mflags} does nothing for this makefile
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
@@ -72,18 +85,29 @@ desktop-file-install \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# and.. manually link..
+%{__ln_s} -f ../pixmaps/%{name}.svg \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/
+
+%{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir}
+%{find_lang} %{name}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/%{name}/
+%{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Mon Jan 22 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 0.2c-1
+- 0.2c
+
 * Sun Jan 14 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 0.2b-1
 - Upstream rename: search4files -> catfish
 - Remove the dependencies for beagle, nautilus,
diff --git a/sources b/sources
index eaff2fa..a4d56e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be15b58868d227b16e81c5046e6bfdcb  catfish0.2b.tar.gz
+27a1893570f5501f938c26105a2d3266  catfish-0.2c.tar.gz