- merged update to 2.6.2 from AC-branch

Changed files:
    evolution.spec -> 1.189

diff --git a/evolution.spec b/evolution.spec
index 1234e636b2d64b166278a301b6dec3693fb79888..1045426eeddfc136ed1592d1f0915c9054210406 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,12 +11,12 @@ Summary(pl):        Klient poczty dla GNOME/Kalendarz/Ksi
 Summary(pt_BR):        Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN):        Evolution - GNOME¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:          evolution
-Version:       2.6.1
+Version:       2.6.2
 Release:       1
 License:       GPL v2
 Group:         Applications/Mail
 Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 6ca70a86e6d8e8b3824e58f28a362065
+# Source0-md5: 24b97cf70a3c1e9e34f6e328e6910ab1
 Source1:       %{name}-gg16.png
 Source2:       %{name}-gg48.png
 Source3:       %{name}-addressbook.desktop
@@ -33,21 +33,21 @@ BuildRequires:      autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: dbus-glib-devel
-BuildRequires: evolution-data-server-devel >= 1.6.0
+BuildRequires: evolution-data-server-devel >= 1.6.2
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.5
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.8.0
 %{?with_pilot:BuildRequires:   gnome-pilot-devel >= 2.0.13}
-BuildRequires: gnome-vfs2-devel >= 2.12.0
+BuildRequires: gnome-vfs2-devel >= 2.12.2
 BuildRequires: gtk-doc >= 1.4
-BuildRequires: gtkhtml-devel >= 3.8.1
+BuildRequires: gtkhtml-devel >= 3.10.2
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: intltool >= 0.33
 BuildRequires: libglade2-devel >= 1:2.5.1
 BuildRequires: libgnomeprintui-devel >= 2.12.0
-BuildRequires: libgnomeui-devel >= 2.12.0
-BuildRequires: libsoup-devel >= 2.2.6.1
+BuildRequires: libgnomeui-devel >= 2.14.1
+BuildRequires: libsoup-devel >= 2.2.93
 BuildRequires: libtool
 BuildRequires: libxml2
 BuildRequires: nspr-devel
@@ -66,8 +66,8 @@ Requires:     %{name}-component = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      GConf2 >= 2.12.0
 Requires:      bonobo-activation
-Requires:      evolution-data-server >= 1.6.0
-Requires:      gtkhtml >= 3.10.0
+Requires:      evolution-data-server >= 1.6.2
+Requires:      gtkhtml >= 3.10.2
 Requires:      hicolor-icon-theme
 Requires:      libglade2 >= 1:2.5.1
 Requires:      psmisc
@@ -109,14 +109,14 @@ Summary(zh_CN):   Evolution
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cyrus-sasl-devel
-Requires:      evolution-data-server-devel >= 1.6.0
+Requires:      evolution-data-server-devel >= 1.6.2
 Requires:      freetype-devel
-Requires:      gnome-vfs2-devel >= 2.12.1
-Requires:      gtkhtml-devel >= 3.10.0
+Requires:      gnome-vfs2-devel >= 2.14.2
+Requires:      gtkhtml-devel >= 3.10.2
 Requires:      libglade2-devel >= 1:2.5.1
 Requires:      libgnomeprintui-devel >= 2.12.0
-Requires:      libgnomeui-devel >= 2.12.0
-Requires:      libsoup-devel >= 2.2.6.1
+Requires:      libgnomeui-devel >= 2.14.1
+Requires:      libsoup-devel >= 2.2.93
 Requires:      nspr-devel
 Requires:      nss-devel
 %{?with_ldap:Requires: openldap-devel >= 2.3.0}