rpms/kazehakase/F-9 kazehakase.spec,1.56,1.57

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27255

Modified Files:
	kazehakase.spec 
Log Message:
* Wed Apr 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-3
- F-9: temporizing fix for xulrunner
  * Enable gtk-mozembed - don't work at all, however does not crash
  * force to install WebKit version



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kazehakase.spec	4 Apr 2008 17:02:57 -0000	1.56
+++ kazehakase.spec	23 Apr 2008 07:00:05 -0000	1.57
@@ -18,10 +18,10 @@
 %define		need_autogen	1
 %endif
 %if 0%{?fedora} == 8
-%define		Geckover	1.8.1.13
+%define		Geckover	1.8.1.14
 %endif
 %if 0%{?fedora} == 7
-%define		Geckover	1.8.1.13
+%define		Geckover	1.8.1.14
 %define		need_autogen	1
 %endif
 
@@ -35,7 +35,7 @@
 %define		svnver		3501_trunk
 
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 
@@ -75,14 +75,17 @@
 BuildRequires:	ruby
 %endif
 %if %{support_webkit}
-# Bug 435562
-BuildRequires:	WebKit-gtk-devel >= 1.0.0-0.6.svn30667
+BuildRequires:	WebKit-gtk-devel
 %endif 	
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 Requires:	%{name}-base 	= %{version}-%{release}
+%if 0%{?fedora} == 9
+# force to install WebKit-based kazehakase
+Requires:	%{name}-webkit	= %{version}-%{release}
+%endif
 
 # GLib version dependency
 # Borrowed from pidgin spec file
@@ -100,19 +103,30 @@
 %endif
 Requires:	gecko-libs %{?Geckover:= %{Geckover}}
 
-%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
+%if %{need_autogen}
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
 %endif
 
+%if 0%{?fedora} < 9
+%description
+Kazehakase is a Web browser which aims to provide 
+a user interface that is truly user-friendly & fully customizable.
+
+This package uses Gecko for HTML rendering engine.
+%else
 %description
 Kazehakase is a Web browser which aims to provide 
 a user interface that is truly user-friendly & fully customizable.
 
 This package uses Gecko for HTML rendering engine.
-If you want to use WebKit for HTML rendering engine, install
-"kazehakase-webkit" rpm instead.
+
+
+IMPORTANT NOTICE on Fedora 9
+On Fedora 9 xulrunner-based kazehakase does not work at all.
+Please use WebKit-based kazehakase
+%endif
 
 %package	base
 Summary:	Base package of Kazehakase
@@ -204,10 +218,6 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-%if %{support_webkit}
-%{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure
-%endif
-
 for f in README.ja TODO.ja ; do
 	iconv -f EUCJP -t UTF8 $f > ${f}.tmp && \
 		( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} ) || \
@@ -215,13 +225,6 @@
 done
 
 %build
-# Bugs for WebKit-gtk
-%if %{support_webkit} && ( 0%{?fedora} <= 8 )
-CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
-CXXFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
-LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
-%endif
-
 %configure \
 %if 0%{?fedora} == 9
 	CC="%{__cc} `nspr-config --cflags`" \
@@ -229,7 +232,7 @@
 %endif
 	--enable-migemo \
 %if 0%{?fedora} == 9
-%if 1
+%if 0
 	--disable-gtkmozembed
 %endif
 %else
@@ -261,14 +264,6 @@
 
 %{find_lang} %{name}
 
-%if 1
-%if 0%{?fedora} == 9
-: This package builds, but does not work at all!!
-: Disabling build intentionally
-exit 1
-%endif
-%endif
-
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -330,6 +325,17 @@
 %endif
 
 %changelog
+* Wed Apr 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-3
+- F-9: temporizing fix for xulrunner
+  * Enable gtk-mozembed - don't work at all, however does not crash
+  * force to install WebKit version
+
+* Wed Apr 16 2008 Christopher Aillon <caillon at redhat.com> - 0.5.4-2.1
+- Rebuild against newer gecko (F-8/9)
+
+* Mon Apr 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-2
+- Rebuild for new WebKit (F-7/8: bug 438531)
+
 * Sun Mar 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-1
 - 0.5.4