cmigemo 対応を追加

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4204 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnome-do/gnome-do-vl.spec

@@ -1,51 +1,57 @@
 %define	mainver		0.8.4
 %define	build_vine5	%( [ "%{?_dist_release}" == "vl5" ] && echo 1 || echo 0)
 
-Name:			gnome-do
+Name:		gnome-do
-Version:		0.8.4
+Version:	0.8.4
-Release:		1%{?_dist_release}
+Release:	3%{?_dist_release}
-Summary:		An intelligent launcher tool for Gnome
+Summary:	An intelligent launcher tool for Gnome
-Summary(ja):		Gnome 用の高機能ランチャー
+Summary(ja):	Gnome 用の高機能ランチャー
-License:		GPLv3+
+License:	GPLv3+
-Group:			Applications/Accessories	
+Group:		Applications/Accessories	
-URL:			http://do.davebsd.com/
+URL:		http://do.davebsd.com/
-Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
+Source0:	http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
-Source1:		gnome-do.desktop
+Source1:	gnome-do.desktop
+# Taken from cmigemo
+Source2:	Migemo.cs.utf8
 # https://bugs.launchpad.net/do/+bug/634556
-#Patch0:			gnome-do-0.8.3.1-mono-2.8.patch
+#Patch0:		gnome-do-0.8.3.1-mono-2.8.patch
-#Patch1:			gnome-do-0.8.3.1-gdk-build-fix.patch
+#Patch1:		gnome-do-0.8.3.1-gdk-build-fix.patch
 # https://bugs.launchpad.net/do/+bug/634550
-Patch2:			gnome-do-0.8.4-cs0200.patch
+Patch2:		gnome-do-0.8.4-cs0200.patch
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://d.hatena.ne.jp/kiwanami/20110612/1307897291
+# https://gist.github.com/1021707, but modified for gnome-do-0.8,4
+Patch3:		gnome-do-0.8.4-cmigemo.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:		ppc64
+ExcludeArch:	ppc64
-
+
-BuildRequires:		mono-devel, mono-addins
+Requires:	cmigemo
-BuildRequires:		desktop-file-utils
+BuildRequires:	mono-devel, mono-addins
-BuildRequires:		ndesk-dbus
+BuildRequires:	desktop-file-utils
-BuildRequires:		ndesk-dbus-glib
+BuildRequires:	ndesk-dbus
-BuildRequires:		gtk-sharp2
+BuildRequires:	ndesk-dbus-glib
-BuildRequires:		notify-sharp-devel
+BuildRequires:	gtk-sharp2
-BuildRequires:		gnome-sharp2, gnome-desktop-sharp2 >= 2.26
+BuildRequires:	notify-sharp-devel
-BuildRequires:		gnome-keyring-sharp-devel
+BuildRequires:	gnome-sharp2, gnome-desktop-sharp2 >= 2.26
-BuildRequires:		gettext
+BuildRequires:	gnome-keyring-sharp-devel
-BuildRequires:		perl-XML-Parser
+BuildRequires:	gettext
-BuildRequires:		intltool
+BuildRequires:	perl-XML-Parser
-BuildRequires:		gtk2-devel
+BuildRequires:	intltool
-BuildRequires:		desktop-file-utils
+BuildRequires:	gtk2-devel
-BuildRequires:		wnck-sharp
+BuildRequires:	desktop-file-utils
-BuildRequires:		gconf-sharp2
+BuildRequires:	wnck-sharp
-BuildRequires:		rsvg2-sharp
+BuildRequires:	gconf-sharp2
-
+BuildRequires:	rsvg2-sharp
-Requires(pre):		GConf2
+
-Requires(post): 	GConf2
+Requires(pre):	GConf2
-Requires(preun): 	GConf2
+Requires(post): GConf2
-
+Requires(preun):GConf2
-Requires:		gnome-keyring-sharp, gnome-desktop-sharp2
+
-Requires:		pkgconfig
+Requires:	gnome-keyring-sharp, gnome-desktop-sharp2
-
+Requires:	pkgconfig
-Packager:		kazutaka
+
+Packager:	kazutaka
 
 %description
 GNOME Do (Do) is an intelligent launcher tool that makes performing
@@ -84,6 +90,10 @@ GNOME Do の開発用ファイルです。
 #%endif
 %patch2 -p0 -b .cs0200
 
+# apply cmigemo patch
+%{__cp} %{SOURCE2} Do.Platform/src/Do.Platform/Migemo.cs
+%patch3 -p1 -b .cmigemo
+
 
 %build
 %configure
@@ -159,6 +169,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jun 23 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.8.4-3
+- update Patch2 to fix Bad quantifier error of regex
+
+* Wed Jun 22 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.8.4-2
+- add Source1 and Patch2: add cmigemo support
+
 * Thu Jan 13 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.8.4-1
 - new upstream release
 - drop Patch0 & 1