SPECS (AC-branch): gtkhtml.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 17:37:43 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gtkhtml.spec (1.137 -> 1.137.4.1) 

---- Diffs:

================================================================
Index: SPECS/gtkhtml.spec
diff -u SPECS/gtkhtml.spec:1.137 SPECS/gtkhtml.spec:1.137.4.1
--- SPECS/gtkhtml.spec:1.137	Tue Nov 29 12:53:57 2005
+++ SPECS/gtkhtml.spec	Mon May 15 19:37:38 2006
@@ -6,31 +6,31 @@
 Summary(uk):	GtkHTML - ĂĹ ÂŚÂĚŚĎÔĹËÁ ŇĹÎÄĹŇÉÎÇŐ/ŇĹÄÁÇŐ×ÁÎÎŃ HTML
 Summary(zh_CN):	gtkhtml żâ
 Name:		gtkhtml
-Version:	3.8.2
+Version:	3.10.1
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	4455e24142cc914f00f1e8b81940df68
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.10/%{name}-%{version}.tar.bz2
+# Source0-md5:	f2b7ff386dae9fcc3b01c4116564722d
 Patch0:		%{name}-pixmap.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-crash.patch
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	ORBit2-devel >= 1:2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gail-devel >= 1.8.3
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-icon-theme >= 2.10.0
+BuildRequires:	gnome-icon-theme >= 2.14.0
 BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeprintui-devel >= 2.11.0-3
-BuildRequires:	libgnomeui-devel >= 2.11.2-2
-BuildRequires:	libsoup-devel >= 2.2.3
+BuildRequires:	libgnomeprintui-devel >= 2.14.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
+BuildRequires:	libsoup-devel >= 2.2.92
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-Requires:	gnome-icon-theme >= 2.10.0
+Requires:	gnome-icon-theme >= 2.14.0
 Requires:	gtk+2 >= 2:2.6.4
 Obsoletes:	gal
 Obsoletes:	libgtkhtml20
@@ -71,8 +71,8 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gail-devel >= 1.8.3
-Requires:	libgnomeprintui-devel >= 2.11.0-3
-Requires:	libgnomeui-devel >= 2.11.2-2
+Requires:	libgnomeprintui-devel >= 2.14.0
+Requires:	libgnomeui-devel >= 2.14.0
 Obsoletes:	gal-devel
 Obsoletes:	libgtkhtml20-devel
 
@@ -190,6 +190,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137.4.1  2006/05/15 17:37:38  baggins
+- merged from HEAD
+
+Revision 1.139  2006/04/10 18:25:17  freetz
+- 3.10.1
+
+Revision 1.138  2006/04/02 06:41:00  freetz
+- merged from DEVEL
+
+Revision 1.137.2.6  2006/03/13 17:35:10  freetz
+- 3.10.0
+
+Revision 1.137.2.5  2006/02/27 20:42:33  freetz
+- 3.9.92
+
+Revision 1.137.2.4  2006/02/13 21:18:50  freetz
+- 3.9.91
+
+Revision 1.137.2.3  2006/02/04 10:30:34  freetz
+- 3.9.90.1
+
+Revision 1.137.2.2  2006/01/31 22:11:12  freetz
+- 3.9.90
+
+Revision 1.137.2.1  2006/01/28 15:22:53  freetz
+- 3.9.5
+
 Revision 1.137  2005/11/29 11:53:57  freetz
 - 3.8.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gtkhtml.spec?r1=1.137&r2=1.137.4.1&f=u