packages: gtkhtml/gtkhtml.spec - merge from DEVEL

[kiesiu]

Author: kiesiu                       Date: Wed Sep 28 19:16:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge from DEVEL

---- Files affected:
packages/gtkhtml:
   gtkhtml.spec (1.199 -> 1.200) 

---- Diffs:

================================================================
Index: packages/gtkhtml/gtkhtml.spec
diff -u packages/gtkhtml/gtkhtml.spec:1.199 packages/gtkhtml/gtkhtml.spec:1.200
--- packages/gtkhtml/gtkhtml.spec:1.199	Thu Sep  8 15:39:59 2011
+++ packages/gtkhtml/gtkhtml.spec	Wed Sep 28 21:16:33 2011
@@ -6,19 +6,19 @@
 Summary(uk.UTF-8):	GtkHTML - це бібліотека рендерингу/редагування HTML
 Summary(zh_CN.UTF-8):	GtkHTML 库
 Name:		gtkhtml
-Version:	4.0.2
+Version:	4.2.0
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/4.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	f63a102a3e24a6e563d2698d11f941ab
-BuildRequires:	GConf2-devel >= 2.24.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/4.2/%{name}-%{version}.tar.xz
+# Source0-md5:	e64deb2007d18a10b9595160613c01e6
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cairo-devel >= 1.10.0
 BuildRequires:	enchant-devel >= 1.1.7
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-icon-theme >= 2.22.0
+BuildRequires:	gsettings-desktop-schemas-devel
 BuildRequires:	gtk+3-devel >= 3.0.2
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes >= 0.49
@@ -26,6 +26,9 @@
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-proto-xproto-devel
+BuildRequires:	xz
 Requires:	gnome-icon-theme >= 2.22.0
 Requires:	gtk+3 >= 3.0.2
 Obsoletes:	gal
@@ -179,6 +182,18 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200  2011/09/28 19:16:33  kiesiu
+- merge from DEVEL
+
+Revision 1.199.2.3  2011/09/25 15:20:17  wiget
+- up to 4.2.0
+
+Revision 1.199.2.2  2011/09/19 19:04:27  wiget
+- up to 4.1.92
+
+Revision 1.199.2.1  2011/09/12 06:49:59  wiget
+- up to 4.1.91
+
 Revision 1.199  2011/09/08 13:39:59  lisu
 - 4.0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtkhtml/gtkhtml.spec?r1=1.199&r2=1.200&f=u