packages: evolution/evolution.spec, evolution/pst-importer.patch (NEW) - up...

[kiesiu]

Author: kiesiu                       Date: Tue Jan 31 14:33:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.2.3
- patch pst-importer for new libpst (change BR)

---- Files affected:
packages/evolution:
   evolution.spec (1.300 -> 1.301) , pst-importer.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/evolution/evolution.spec
diff -u packages/evolution/evolution.spec:1.300 packages/evolution/evolution.spec:1.301
--- packages/evolution/evolution.spec:1.300	Tue Nov 15 12:56:40 2011
+++ packages/evolution/evolution.spec	Tue Jan 31 15:33:04 2012
@@ -11,12 +11,12 @@
 Summary(pt_BR.UTF-8):	Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN.UTF-8):	Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄)
 Name:		evolution
-Version:	3.2.2
+Version:	3.2.3
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	1c661fb7a982ba6b3624becaa3079eb8
+# Source0-md5:	27b2e4ec00c7b9af03f9f034a3ad5dcd
 Source1:	%{name}-gg16.png
 Source2:	%{name}-gg48.png
 Source3:	%{name}-addressbook.desktop
@@ -26,6 +26,7 @@
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-gnome-icon-theme.patch
 Patch2:		champlain-0.12.patch
+Patch3:		pst-importer.patch
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	GConf2-devel >= 2.28.0
 BuildRequires:	NetworkManager-devel >= 0.7
@@ -37,7 +38,7 @@
 BuildRequires:	clutter-devel >= 1.0.0
 BuildRequires:	clutter-gtk-devel >= 0.90
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	evolution-data-server-devel >= 3.2.0
+BuildRequires:	evolution-data-server-devel >= 3.2.3
 BuildRequires:	geoclue-devel >= 0.11.1
 BuildRequires:	gettext-devel >= 0.18.1
 BuildRequires:	glib2-devel >= 1:2.28.0
@@ -60,7 +61,7 @@
 BuildRequires:	libgweather-devel >= 3.0.0
 BuildRequires:	libical-devel
 BuildRequires:	libnotify-devel >= 0.5.1
-BuildRequires:	libpst-devel >= 0.6.41
+BuildRequires:	libpst-devel >= 0.6.54
 BuildRequires:	libsoup-gnome-devel >= 2.31.2
 BuildRequires:	libtool >= 2.2
 BuildRequires:	libxml2-devel >= 1:2.7.3
@@ -260,6 +261,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
@@ -816,6 +818,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.301  2012/01/31 14:33:04  kiesiu
+- updated to 3.2.3
+- patch pst-importer for new libpst (change BR)
+
 Revision 1.300  2011/11/15 11:56:40  megabajt
 - updated to 3.2.2
 

================================================================
Index: packages/evolution/pst-importer.patch
diff -u /dev/null packages/evolution/pst-importer.patch:1.1
--- /dev/null	Tue Jan 31 15:33:10 2012
+++ packages/evolution/pst-importer.patch	Tue Jan 31 15:33:04 2012
@@ -0,0 +1,11 @@
+--- a/plugins/pst-import/pst-importer.c
++++ b/plugins/pst-import/pst-importer.c
+@@ -2219,7 +2219,7 @@ pst_init (pst_file *pst,
+ 	DEBUG_REGISTER_CLOSE ();
+ #endif
+ 
+-	if (pst_open (pst, filename) < 0) {
++	if (pst_open (pst, filename, NULL) < 0) {
+ 		pst_error_msg ("Error opening PST file %s", filename);
+ 		return -1;
+ 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution.spec?r1=1.300&r2=1.301&f=u