SPECS: epiphany.spec - 2.22.0 - merged from DEVEL

[patrys]

Author: patrys                       Date: Tue Mar 11 21:14:50 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   epiphany.spec (1.169 -> 1.170) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.169 SPECS/epiphany.spec:1.170
--- SPECS/epiphany.spec:1.169	Fri Feb  8 20:49:52 2008
+++ SPECS/epiphany.spec	Tue Mar 11 22:14:45 2008
@@ -3,17 +3,17 @@
 #Conditional build:
 %bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
 #
-%define		basever		2.20
+%define		basever		2.22
 Summary:	Epiphany - gecko-based GNOME web browser
 Summary(es.UTF-8):	Epiphany - navigador Web de GNOME basado en gecko
 Summary(pl.UTF-8):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
-Version:	2.20.3
-Release:	2
+Version:	2.22.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	df2861b3e91bef6d365f50187b6170cb
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	81ad67d1ad706930a295a7ed9887bf5f
 Patch0:		%{name}-pld-homepage.patch
 Patch1:		%{name}-configure.patch
 Patch2:		%{name}-agent.patch
@@ -28,7 +28,7 @@
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gnome-desktop-devel >= 2.20.0
 BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	gtk-doc >= 1.8
 %if %{with webkit}
@@ -39,7 +39,7 @@
 BuildRequires:	iso-codes >= 0.53
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeprintui-devel >= 2.18.0
-BuildRequires:	libgnomeui-devel >= 2.20.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	libxslt-devel >= 1.1.20
@@ -60,8 +60,8 @@
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	dbus >= 1.0.2
-Requires:	gnome-icon-theme >= 2.20.0
-Requires:	libgnomeui >= 2.20.0
+Requires:	gnome-icon-theme >= 2.22.0
+Requires:	libgnomeui >= 2.22.0
 %if %{without webkit}
 %requires_eq	xulrunner
 %endif
@@ -127,11 +127,6 @@
 sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
 mv po/sr\@{Latn,latin}.po
 
-sed -i -e 's#WebKitGdk#WebKitGtk#g' configure.ac
-sed -i -e 's#WebKitGtkPage#WebKitPage#g' embed/webkit/*.cpp embed/webkit/*.h
-sed -i -e 's#webkit_gtk_#webkit_#g' embed/webkit/*.cpp embed/webkit/*.h
-sed -i -e 's#WEBKIT_GTK_PAGE#WEBKIT_PAGE#g' embed/webkit/*.cpp embed/webkit/*.h
-
 %build
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
@@ -226,12 +221,25 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2008-03-11 21:14:45  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.167.2.3  2008-03-11 21:11:38  patrys
+- 2.22.0
+
+Revision 1.167.2.2  2008-03-10 00:05:03  patrys
+- 2.21.92
+
 Revision 1.169  2008-02-08 19:49:52  hawk
 - release 2 (xulrunner 1.8.1.12)
 
 Revision 1.168  2008-01-09 20:41:20  megabajt
 - updated to 2.20.3
 
+Revision 1.167.2.1  2007-12-19 15:11:19  patrys
+- 2.21.4
+
 Revision 1.167  2007-12-02 12:38:09  hawk
 - release 2 (xulrunner 1.8.1.11)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany.spec?r1=1.169&r2=1.170&f=u