rpms/kazehakase/devel kazehakase-0.5.7-rev3832-dbus.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 kazehakase.spec, 1.93, 1.94 sources, 1.36, 1.37 kazehakase-rev3773-gtk021705.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8521

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-rev3832-dbus.patch 
Removed Files:
	kazehakase-rev3773-gtk021705.patch 
Log Message:
* Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
- Try rev 3832 for new dbus feature
- Kill ruby support until it gets compiled


kazehakase-0.5.7-rev3832-dbus.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kazehakase-0.5.7-rev3832-dbus.patch ---
Index: dbus/Makefile.am
===================================================================
--- dbus/Makefile.am	(revision 3832)
+++ dbus/Makefile.am	(working copy)
@@ -6,6 +6,7 @@
 INCLUDES =					\
 	-I$(top_srcdir)/src/bookmarks		\
 	-I$(top_srcdir)/src			\
+	-I$(top_srcdir)/src/utils			\
 	-I$(top_builddir)/libegg/pixbufthumbnail
 
 CLEANFILES = $(BUILT_SOURCES)
@@ -37,7 +38,7 @@
 sample_browser_LDADD = 				\
         $(GTK_LIBS)	                        \
         $(DBUS_GLIB_LIBS)                       \
-	$(top_builddir)/dbus/libkzdbus.la	\
+	libkzdbus.la	\
         $(top_builddir)/src/libkazehakase.la 
 
 kz-dbus-embed-agent-server-bindings.h: kazehakase-embed.xml


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Aug 2009 05:37:09 -0000	1.36
+++ .cvsignore	7 Sep 2009 17:03:16 -0000	1.37
@@ -1 +1 @@
-kazehakase-0.5.7.tar.gz
+kazehakase-0.5.7-svn3832_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kazehakase.spec	29 Aug 2009 06:15:48 -0000	1.93
+++ kazehakase.spec	7 Sep 2009 17:03:16 -0000	1.94
@@ -12,13 +12,18 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%undefine		usesvn		
+# Kill ruby extension for F-13 until it gets compiled
+%if 0%{?fedora} >= 13
+%define		support_ruby	0
+%endif
+
+%define		usesvn		1
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1
+%define		Geckover	1.9.1.2
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -31,10 +36,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		43338
-%define		svnver		3783_trunk
+%define		svnver		3832_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	3
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -54,8 +59,13 @@ URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
+%if 0%{?fedora} <= 11
+Patch15:	kazehakase-0.5.7-gtk0218.patch
+%endif
+Patch16:	kazehakase-0.5.7-rev3832-dbus.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	dbus-devel
 BuildRequires:	expat-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	gtk2-devel
@@ -112,6 +122,9 @@ This package uses Gecko for HTML renderi
 %package	base
 Summary:	Base package of Kazehakase
 Group:		Applications/Internet
+%if %{support_ruby} < 1
+Obsoletes:	%{name}-ruby < %{version}-%{release}
+%endif
 
 %description	base
 This package contains base files for Kazehakase.
@@ -177,6 +190,11 @@ This package uses WebKit for HTML render
 
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
+%if 0%{?fedora} <= 11
+# Reverse!!
+%patch15 -p0 -b .gtk -R
+%endif
+%patch16 -p0 -b .mak
 
 %if %{need_autogen}
 sh autogen.sh
@@ -233,6 +251,9 @@ export CFLAGS="%{optflags} -DVERSION_VEN
 %configure \
 	--disable-shave \
 	--enable-migemo \
+%if %{support_ruby} < 1
+	--with-ruby=no \
+%endif
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
@@ -270,10 +291,13 @@ desktop-file-install \
 %config(noreplace) %{_sysconfdir}/%{name}/mozilla/*.xml
 
 %{_bindir}/%{name}
+%{_bindir}/kz-embed-process
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/embed/
 %dir %{_libdir}/%{name}/search/
+
 %{_libdir}/%{name}/libkazehakase.so.*
+%{_libdir}/%{name}/embed/per_process.so
 
 %dir %{_datadir}/%{name}/
 %if %{support_ruby}
@@ -317,6 +341,10 @@ desktop-file-install \
 %endif
 
 %changelog
+* Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
+- Try rev 3832 for new dbus feature
+- Kill ruby support until it gets compiled
+
 * Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
 - Update to 0.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	29 Aug 2009 05:37:10 -0000	1.36
+++ sources	7 Sep 2009 17:03:16 -0000	1.37
@@ -1 +1 @@
-1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz
+c0dc821388840869ba4ef97e14d02661  kazehakase-0.5.7-svn3832_trunk.tar.gz


--- kazehakase-rev3773-gtk021705.patch DELETED ---