rpms/kazehakase/F-8 kazehakase.spec,1.46,1.47
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Wed Mar 5 07:41:09 UTC 2008
Author: mtasaka
Update of /cvs/extras/rpms/kazehakase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5023/F-8
Modified Files:
kazehakase.spec
Log Message:
* Sun Mar 2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-2
- Support WebGTK
Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kazehakase.spec 29 Feb 2008 15:49:53 -0000 1.46
+++ kazehakase.spec 5 Mar 2008 07:40:25 -0000 1.47
@@ -4,6 +4,12 @@
# $ mv trunk %%name-%%version-svn%%svnver
# $ tar czf %%name-%%version-svn%%svnver.tar.gz %%name-%%version-svn%%svnver
+%define support_anthy 0
+%define support_ruby 1
+%define rubyabi 1.8
+%define support_webkit 1
+
+
%if 0%{?fedora} == 9
%define Geckover 1.9
%endif
@@ -15,12 +21,6 @@
%endif
%define obsolete_plugin_ver 0.4.5-1
-%define support_anthy 0
-%define support_ruby 1
-%define rubyabi 1.8
-# WebKitWebSettings not implemented on Fedora yet
-%define support_webkit 0
-
%define repoid 29695
%define svnver 3410_trunk
@@ -31,7 +31,7 @@
%endif
-%define fedorarel 1
+%define fedorarel 2
%define _release %{fedorarel}%{?usesvn:.svn%svnver}
@@ -49,9 +49,8 @@
Source1: gscripttable.h.gz
Patch0: kazehakase-svn3235-3237-diff.patch.gz
%endif
-%if 0%{?fedora} >= 9
-Patch15: kazehakase-0.5.2-svn3410_trunk-verup.patch
-%endif
+# Upstream forgot to package this?
+Source2: kz-webkit-gtk.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
@@ -72,8 +71,9 @@
BuildRequires: ruby
%endif
%if %{support_webkit}
-BuildRequires: WebKit-gtk-devel
-%endif
+# Bug 435562
+BuildRequires: WebKit-gtk-devel >= 1.0.0-0.6.svn30667
+%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -141,7 +141,17 @@
%description ruby
This package contains the binding of Kazehakase for
Ruby interpretter.
-%endif
+%endif
+
+%if %{support_webkit}
+%package webkit
+Summary: WebKit embed module of Kazehakase
+Group: Application/Internet
+Requires: %{name} = %{version}-%{release}
+
+%description webkit
+This package contains WebKit embed module of Kazehakase.
+%endif
%prep
%setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
@@ -155,9 +165,6 @@
%{__gzip} -d *gz
cd ../..
%endif
-%if 0%{?fedora} == 9
-%{__patch} -p1 -s -Z -b --suffix .ver < %PATCH15
-%endif
%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
sh autogen.sh
@@ -170,17 +177,17 @@
%if %{support_anthy}
%{__sed} -i.anthy -e '/^anthy_available/d' configure
%endif
+
%if %{support_webkit}
+cp -p %{SOURCE2} module/embed/webkit-gtk/
%{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure
-%{__sed} -i.WebKit -e 's|webkit/webkit.h|webkit.h|' \
- module/embed/webkit-gtk/kz-webkit-gtk.h
%endif
%build
# ??? perhaps bugs for WebKit-gtk
%if %{support_webkit}
-CFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`"
-CXXFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`"
+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
@@ -285,7 +292,16 @@
%{_datadir}/%{name}/ext/ruby/
%endif
+%if %{support_webkit}
+%files webkit
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/embed/webkit_gtk.so
+%endif
+
%changelog
+* Sun Mar 2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-2
+- Support WebGTK
+
* Sat Mar 1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-1
- 0.5.3
More information about the fedora-extras-commits
mailing list