rpms/epiphany/devel epiphany.spec,1.229,1.230

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13885

Modified Files:
	epiphany.spec 
Log Message:
2.27.2



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- epiphany.spec	22 May 2009 14:21:38 -0000	1.229
+++ epiphany.spec	1 Jun 2009 04:51:34 -0000	1.230
@@ -1,20 +1,20 @@
-%define gecko_ver 1.9.1
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.18.0
 %define gtk2_devel_ver 2.15.1
 %define scrollkeeper_ver 0.1.4
 %define gnome_doc_utils_ver 0.3.2
+%define webkitgtk_ver 1.1.7
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.26.1
-Release: 4%{?dist}
-%define major_version 2.26
+Version: 2.27.2
+Release: 1%{?dist}
+%define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
-Source0: http://download.gnome.org/sources/epiphany/2.26/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/epiphany/2.27/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): scrollkeeper
@@ -24,12 +24,11 @@ Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires: gecko-libs = %{gecko_ver}
 Requires: gnome-icon-theme >= 1.0.6-1
 Requires: iso-codes >= 0.45
 BuildRequires: glib2-devel >= %{glib2_devel_ver}
 BuildRequires: gtk2-devel >= %{gtk2_devel_ver}
-BuildRequires: gecko-devel-unstable = %{gecko_ver}
+BuildRequires: webkitgtk-devel >= %{webkitgtk_ver}
 BuildRequires: scrollkeeper >= %{scrollkeeper_ver}
 BuildRequires: libxml2-devel, libxslt-devel
 BuildRequires: libgnomeui-devel, libglade2-devel
@@ -46,14 +45,12 @@ BuildRequires: intltool
 BuildRequires: NetworkManager-devel
 %endif
 BuildRequires: pygtk2-devel, gnome-python2-devel
+BuildRequires: libnotify-devel
+BuildRequires: libsoup-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
-Patch1: epiphany-2.17.3-use-pango.patch
 Patch2: epiphany-2.18.1-default-bookmarks.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=334751
-Patch3: epiphany-2.20.1-wrapped-plugins.patch
-Patch5: epiphany-2.25.91-missingheader.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -70,7 +67,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel >= %{glib2_devel_ver}
 Requires: gtk2-devel >= %{gtk2_devel_ver}
-Requires: gecko-devel = %{gecko_ver}
+Requires: webkitgtk-devel >= %{webkitgtk_ver}
 Requires: scrollkeeper >= %{scrollkeeper_ver}
 Requires: libxml2-devel, libxslt-devel
 Requires: libgnomeui-devel, libglade2-devel
@@ -98,10 +95,7 @@ Install epiphany-devel if you want to wr
 %setup -q
 
 %patch0 -p1 -b .homepage
-%patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
-%patch3 -p1 -b .wrapped-plugins
-%patch5 -p1 -b .missing-header
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
 pref("general.useragent.vendor", "Fedora");
@@ -119,7 +113,7 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 %define enable_nm --enable-network-manager
 %endif
 %configure \
-	--with-gecko=libxul-embedding \
+	--with-distributor-name=Fedora \
 	--disable-scrollkeeper \
 	--enable-zeroconf \
 	--enable-python \
@@ -187,8 +181,6 @@ update-desktop-database -q %{_datadir}/a
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/epiphany.schemas \
-  %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas \
-  %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas \
   %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null || :
 scrollkeeper-update -q
 touch %{_datadir}/icons/hicolor
@@ -232,8 +224,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc README NEWS COPYING COPYING.README AUTHORS
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
-%{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
-%{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
 %{_libdir}/epiphany
 %{_bindir}/epiphany
 %{_datadir}/applications/*.desktop
@@ -255,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Jun  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-1
+- Update to 2.27.2
+- Build against webkit instead of gecko
+
 * Fri May 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.26.1-4
 - Include /usr/include/epiphany directory (#473651).