[epiphany/f14/master] 2.30.2-2

[Matthias Clasen]

commit 31b215d206a2a73283f1e93c2c08d16267360de8
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 11 23:06:56 2010 -0400

    2.30.2-2

 epiphany.spec |   29 +++++++++++++++++++++--------
 sources       |    2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/epiphany.spec b/epiphany.spec
index 74c31ef..b06a8c8 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -3,13 +3,14 @@
 %define gtk2_devel_ver 2.18.0
 %define scrollkeeper_ver 0.1.4
 %define gnome_doc_utils_ver 0.3.2
-%define webkitgtk_ver 1.3.2
+%define webkitgtk_ver 1.1.19
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.31.5
-Release: 1%{?dist}
-%define major_version 2.31
+Epoch: 1
+Version: 2.30.2
+Release: 2%{?dist}
+%define major_version 2.30
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
@@ -17,16 +18,18 @@ URL: http://www.gnome.org/projects/epiphany/
 #VCS: git:git://git.gnome.org/epiphany
 Source0: http://download.gnome.org/sources/epiphany/%{major_version}/%{name}-%{version}.tar.bz2
 
+Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
+Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 Requires: gnome-icon-theme >= 1.0.6-1
 Requires: iso-codes >= 0.45
 BuildRequires: glib2-devel >= %{glib2_devel_ver}
-BuildRequires: gtk3-devel
-BuildRequires: webkitgtk3-devel
+BuildRequires: gtk2-devel >= %{gtk2_devel_ver}
+BuildRequires: webkitgtk-devel >= %{webkitgtk_ver}
 BuildRequires: scrollkeeper >= %{scrollkeeper_ver}
 BuildRequires: libxml2-devel, libxslt-devel
 BuildRequires: GConf2-devel
@@ -46,6 +49,7 @@ BuildRequires: pygtk2-devel, gnome-python2-devel
 BuildRequires: libnotify-devel
 BuildRequires: libsoup-devel
 BuildRequires: nss-devel
+BuildRequires: gir-repository-devel >= 0.6.5-5
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
@@ -65,8 +69,9 @@ Summary: Support for developing extensions for the epiphany web browser
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel >= %{glib2_devel_ver}
-Requires: gtk3-devel >= %{gtk2_devel_ver}
-Requires: webkitgtk3-devel >= %{webkitgtk_ver}
+Requires: gtk2-devel >= %{gtk2_devel_ver}
+Requires: webkitgtk-devel >= %{webkitgtk_ver}
+Requires: scrollkeeper >= %{scrollkeeper_ver}
 Requires: libxml2-devel, libxslt-devel
 Requires: libgnomeui-devel, libglade2-devel
 Requires: GConf2-devel
@@ -132,6 +137,7 @@ done
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -203,6 +209,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/HighContrastLargePrint &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/HighContrastLargePrintInverse &> /dev/null || :
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README NEWS COPYING COPYING.README AUTHORS
@@ -229,7 +238,11 @@ gtk-update-icon-cache %{_datadir}/icons/HighContrastLargePrintInverse &> /dev/nu
 %{_datadir}/gtk-doc/html/epiphany
 %{_datadir}/gir-1.0
 
+
 %changelog
+* Wed Aug 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.2-1
+- Revert to the 2.30 series for F14
+
 * Wed Jul 14 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.5-1
 - Update to 2.31.5
 
diff --git a/sources b/sources
index c2032a6..682534b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eafe49c6e4d0cfdae535d25012761ad4  epiphany-2.31.5.tar.bz2
+29b084acfa016540d91d3601ec3dff5c  epiphany-2.30.2.tar.bz2