- update to 0.5.4

- add plugins packages contains gecko and webkit support
- add bconds which disable engine-plugins build
- update descriptions for main and plugins packages

Changed files:
    kazehakase.spec -> 1.60

diff --git a/kazehakase.spec b/kazehakase.spec
index 3efe81173d9bb1c83419c11293e6b0bd6677e551..f8fd38386035e496b3b32a7028c6f61780fe3070 100644 (file)
--- a/kazehakase.spec
+++ b/kazehakase.spec
@@ -1,12 +1,17 @@
-Summary:       A browser with gecko engine
-Summary(pl.UTF-8):     Przeglądarka na silniku gecko
+#
+#Conditional builds
+%bcond_without gecko   #Build without gecko support
+%bcond_without webkit  #Build without webkit support
+#
+Summary:       A browser with multiple rendering engines support
+Summary(pl.UTF-8):     Przeglądarka wspierająca wile silników renderujących
 Name:          kazehakase
-Version:       0.5.3
+Version:       0.5.4
 Release:       1
 License:       GPL
 Group:         X11/Applications/Networking
-Source0:       http://downloads.sourceforge.jp/kazehakase/29695/%{name}-%{version}.tar.gz
-# Source0-md5: 1635cc357f1a65c8fdcad56cdcd8bb9c
+Source0:       http://downloads.sourceforge.jp/kazehakase/30219/%{name}-%{version}.tar.gz
+# Source0-md5: 75f8afb9ddf4493c3a1fb4eb38a044df
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-agent.patch
 Patch2:                %{name}-deprecated.patch
@@ -16,11 +21,13 @@ BuildRequires:      automake
 BuildRequires: gettext-devel
 BuildRequires: gnutls-devel
 BuildRequires: gtk+2-devel
+%{?with_webkit:BuildRequires:  gtk-webkit-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: xulrunner-devel
+%{?with_gecko:BuildRequires:   xulrunner-devel}
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      engine_plugin
 %requires_eq_to        xulrunner xulrunner-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,11 +35,13 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautoreq      libxpcom.so
 
 %description
-Kazehakase is a browser with gecko engine like Epiphany or Galeon.
+Kazehakase is a browser which allow use many rendering engines. For
+now it support only geco (like Epiphany or Galeon) and webkit engines.
 
 %description -l pl.UTF-8
-Kazehakase jest przeglądarką na silniku gecko podobnie do Epiphany lub
-Galeona.
+Kazehakase jest przeglądarką, która pozwala na używanie wielu
+silników renderujących. Na dzień dzisiejszy wspiera silniki geco
+(takie jak u Epiphany lub Galeona ) oraz webkit.
 
 %package libs
 Summary:       Kazehakase libraries
@@ -45,6 +54,32 @@ This package contains Kazehakase libraries.
 %description libs -l pl.UTF-8
 Pakiet zawiera biblioteki Kazehakase.
 
+%package plugin-gecko
+Summary:       Gecko plugin engine for Kazehakase
+Summary(pl.UTF-8):     Plugin gecko dla Kazehakase
+Group:         X11/Applications/Networking
+Requires:      xulrunner
+Provides:      engine_plugin
+
+%description plugin-gecko
+This plugin provides gecko rendering engine support.
+
+%description plugin-gecko -l pl.UTF-8
+Ten plugin dodaje wsparcie dla silnika renderującego gecko.
+
+%package plugin-webkit
+Summary:       Webkit plugin engine for Kazehakase
+Summary(pl.UTF-8):     Plugin webkit dla Kazehakase
+Group:         X11/Applications/Networking
+Provides:      engine_plugin
+
+%description plugin-webkit
+This plugin provides webkit rendering engine support.
+
+%description plugin-webkit -l pl.UTF-8
+Ten plugin dodaje wsparcie dla silnika renderującego webkit.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -56,7 +91,9 @@ Pakiet zawiera biblioteki Kazehakase.
 %{__aclocal} -I macros
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       %{!?with_gecko:--disable-gecko}
+       %{!?with_webkit:--disable-webkit}
 
 %{__make}
 
@@ -94,5 +131,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.so.*
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/embed
-%attr(755,root,root) %{_libdir}/%{name}/embed/*.so
+%dir %{_libdir}/%{name}/embed/
+
+%if %{with_gecko}
+%files plugin-gecko
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/embed/gecko.so
+%endif
+%if %{with_webkit}
+%files plugin-webkit
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/embed/webkit_gtk.so
+%endif