SPECS (DEVEL): epiphany.spec - 1.9.6, configure patch (aginst mozi...

[freetz]

Author: freetz                       Date: Wed Feb  1 17:28:35 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 1.9.6, configure patch (aginst mozilla madness), files list update

---- Files affected:
SPECS:
   epiphany.spec (1.105.2.1 -> 1.105.2.2) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.105.2.1 SPECS/epiphany.spec:1.105.2.2
--- SPECS/epiphany.spec:1.105.2.1	Tue Oct 25 21:17:46 2005
+++ SPECS/epiphany.spec	Wed Feb  1 18:28:29 2006
@@ -6,17 +6,17 @@
 Summary(es):	Epiphany - navigador Web de GNOME basado en gecko
 Summary(pl):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
-Version:	1.9.1
+Version:	1.9.6
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/1.9/%{name}-%{version}.tar.bz2
-# Source0-md5:	f44e8dbfe33802ef250e5494579625f5
+# Source0-md5:	097278ad79deaa017b8c026b5c8a383f
 Patch0:		%{name}-first-tab.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-mozilla_includes.patch
-Patch3:		%{name}-mozilla.patch
-Patch4:		%{name}-pld-homepage.patch
+Patch3:		%{name}-pld-homepage.patch
+Patch4:		%{name}-configure.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	ORBit2-devel >= 1:2.12.1
@@ -43,7 +43,6 @@
 BuildRequires:	mozilla-devel >= 5:1.7.9
 %endif
 BuildRequires:	pkgconfig
-# Requries but python package not present?
 BuildRequires:	python-gnome-devel >= 2.6.0
 BuildRequires:	python-pygtk-devel >= 2.6.0
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -51,6 +50,7 @@
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
+Requires:	dbus >= 0.34
 Requires:	gnome-icon-theme >= 2.10.0
 Requires:	gtk+2 >= 2:2.8.3
 %if %{with mozilla_firefox}
@@ -130,7 +130,6 @@
 	HTML_DIR=%{_gtkdocdir}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry/*
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/1.9/plugins/*.la
 
 # epiphany-2.0.mo, but gnome/help/epiphany
@@ -140,12 +139,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%gconf_schema_install epiphany-fonts.schemas
 %gconf_schema_install epiphany-lockdown.schemas
 %gconf_schema_install epiphany.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
 
 %preun
+%gconf_schema_uninstall epiphany-fonts.schemas
 %gconf_schema_uninstall epiphany-lockdown.schemas
 %gconf_schema_uninstall epiphany.schemas
 
@@ -157,10 +158,11 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/bonobo/servers/*
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
 %{_omf_dest_dir}/*
@@ -185,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.2.2  2006/02/01 17:28:29  freetz
+- 1.9.6, configure patch (aginst mozilla madness), files list update
+
 Revision 1.105.2.1  2005/10/25 19:17:46  paladine
 - updated to 1.9.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.105.2.1&r2=1.105.2.2&f=u