rpms/kazehakase/F-8 kazehakase.spec,1.53,1.54

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	kazehakase.spec 
Log Message:
* 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)



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kazehakase.spec	29 Mar 2008 15:56:40 -0000	1.53
+++ kazehakase.spec	14 Apr 2008 15:04:06 -0000	1.54
@@ -8,18 +8,25 @@
 %define		support_ruby	1
 %define		rubyabi		1.8
 %define		support_webkit	1
-%undefine	usesvn
 
+%undefine	usesvn
+%define		need_autogen	0
 
 %if 0%{?fedora} == 9
 %define		Geckover	1.9
 #%%define		usesvn		1
+%define		need_autogen	1
 %endif
 %if 0%{?fedora} == 8
 %define		Geckover	1.8.1.13
 %endif
 %if 0%{?fedora} == 7
 %define		Geckover	1.8.1.13
+%define		need_autogen	1
+%endif
+
+%if 0%{?use_svn} > 0
+%define		need_autogen	1
 %endif
 
 %define		obsolete_plugin_ver	0.4.5-1
@@ -28,7 +35,7 @@
 %define		svnver		3501_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 
@@ -42,11 +49,10 @@
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 %if 0%{?fedora} < 8
-Source1:	gscripttable.h.gz
 Patch0:		kazehakase-svn3235-3237-diff.patch.gz
 %endif
 %if 0%{?fedora} >= 9
-Patch10:	kazehakase-0.5.3-svn3493_trunk-compile.patch
+Patch10:	kazehakase-0.5.4-compile.patch
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,8 +74,7 @@
 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
@@ -93,7 +98,7 @@
 %endif
 Requires:	gecko-libs %{?Geckover:= %{Geckover}}
 
-%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
+%if %{need_autogen}
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -178,14 +183,9 @@
 %if 0%{?fedora} < 8
 %{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \
 	( for f in `find . -name \*.rej | sort` ; do cat $f ; done )
-
-cd src/utils
-cp -p %SOURCE1 .
-%{__gzip} -d *gz
-cd ../..
 %endif
 
-%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
+%if %{need_autogen}
 sh autogen.sh
 %endif
 
@@ -197,10 +197,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} ) || \
@@ -208,13 +204,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`" \
@@ -222,7 +211,9 @@
 %endif
 	--enable-migemo \
 %if 0%{?fedora} == 9
+%if 1
 	--disable-gtkmozembed
+%endif
 %else
 	--with-gecko-engine=firefox
 %endif
@@ -321,6 +312,9 @@
 %endif
 
 %changelog
+* 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