Author: glen Date: Sun Nov 23 16:35:57 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- register in browser-plugins to get plugins into
/usr/lib64/epiphany/2.24/plugins
---- Files affected:
SPECS:
epiphany.spec (1.195 -> 1.196)
---- Diffs:
================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.195 SPECS/epiphany.spec:1.196
--- SPECS/epiphany.spec:1.195 Sun Nov 23 10:03:02 2008
+++ SPECS/epiphany.spec Sun Nov 23 17:35:51 2008
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
#Conditional build:
-%bcond_with webkit # Build with experimental webkit suppor instead
of xulrunner
+%bcond_with webkit # Build with experimental webkit support
instead of xulrunner
#
%define basever 2.24
Summary: Epiphany - gecko-based GNOME web browser
@@ -53,7 +53,7 @@
BuildRequires: python-pygtk-devel >= 2:2.12.0
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.364
BuildRequires: scrollkeeper
BuildRequires: startup-notification-devel >= 0.8
%if %{without webkit}
@@ -68,7 +68,10 @@
Requires: dbus >= 1.0.2
Requires: gnome-icon-theme >= 2.22.0
Requires: libgnomeui >= 2.22.0
+Provides: wwwbrowser
%if %{without webkit}
+Requires: browser-plugins >= 2.0
+Requires: browser-plugins(%{_target_base_arch})
%requires_eq xulrunner
%endif
Obsoletes: python-epiphany
@@ -151,14 +154,14 @@
%configure \
--disable-schemas-install \
--enable-dbus \
- %{?!with_webkit:--enable-gtk-doc} \
+ %{!?with_webkit:--enable-gtk-doc} \
--enable-network-manager \
--enable-python \
- %if %{with webkit}
+%if %{with webkit}
--with-engine=webkit \
- %else
+%else
--with-gecko=libxul-embedding \
- %endif
+%endif
--with-html-dir=%{_gtkdocdir}
%{__make}
@@ -166,6 +169,8 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/%{basever}/plugins
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
HTML_DIR=%{_gtkdocdir}
@@ -186,6 +191,9 @@
%scrollkeeper_update_post
%update_desktop_database_post
%update_icon_cache hicolor
+%if %{without webkit}
+%update_browser_plugins
+%endif
%preun
%gconf_schema_uninstall epiphany-fonts.schemas
@@ -197,10 +205,22 @@
%scrollkeeper_update_postun
%update_desktop_database_postun
%update_icon_cache hicolor
+%if %{without webkit}
+if [ "$1" = 0 ]; then
+ %update_browser_plugins
+%endif
+%endif
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
+
+%if %{without webkit}
+# browser plugins v2
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size)
%{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+%endif
+
%attr(755,root,root) %{_bindir}/*
%{_datadir}/dbus-1/services/*.service
%{_datadir}/%{name}
@@ -236,6 +256,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.196 2008/11/23 16:35:51 glen
+- register in browser-plugins to get plugins into
/usr/lib64/epiphany/2.24/plugins
+
Revision 1.195 2008/11/23 09:03:02 wrobell
- look for plugins in xulrunner directory not in mozilla one
- rel. 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany.spec?r1=1.195&r2=1.196&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
