packages (DEVEL): evolution/evolution.spec, evolution/champlain-0.12.patch ...

[wiget]

Author: wiget                        Date: Tue Sep 20 12:19:09 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- build with libchamplain 0.12

---- Files affected:
packages/evolution:
   evolution.spec (1.296.2.4 -> 1.296.2.5) , champlain-0.12.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/evolution/evolution.spec
diff -u packages/evolution/evolution.spec:1.296.2.4 packages/evolution/evolution.spec:1.296.2.5
--- packages/evolution/evolution.spec:1.296.2.4	Tue Sep 20 11:11:11 2011
+++ packages/evolution/evolution.spec	Tue Sep 20 14:19:03 2011
@@ -12,7 +12,7 @@
 Summary(zh_CN.UTF-8):	Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄)
 Name:		evolution
 Version:	3.1.92
-Release:	0.2
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.1/%{name}-%{version}.tar.xz
@@ -25,6 +25,7 @@
 Source6:	%{name}-tasks.desktop
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-gnome-icon-theme.patch
+Patch2:		champlain-0.12.patch
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	GConf2-devel >= 2.28.0
 BuildRequires:	NetworkManager-devel >= 0.7
@@ -257,6 +258,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -813,6 +815,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.296.2.5  2011/09/20 12:19:03  wiget
+- build with libchamplain 0.12
+
 Revision 1.296.2.4  2011/09/20 09:11:11  wiget
 - BR mono-devel and python-devel (for embedding hooks)
 - BR newer rpmbuild(macros) for %{__with_without} macro

================================================================
Index: packages/evolution/champlain-0.12.patch
diff -u /dev/null packages/evolution/champlain-0.12.patch:1.1.2.1
--- /dev/null	Tue Sep 20 14:19:09 2011
+++ packages/evolution/champlain-0.12.patch	Tue Sep 20 14:19:03 2011
@@ -0,0 +1,37 @@
+--- evolution-3.1.92/configure.ac.wiget	2011-09-20 12:46:18.597079039 +0200
++++ evolution-3.1.92/configure.ac	2011-09-20 12:46:56.003114171 +0200
+@@ -50,7 +50,7 @@ m4_define([libpst_minimum_version], [0.6
+ m4_define([libnotify_minimum_version], [0.5.1])
+ 
+ dnl Optional Packages
+-m4_define([champlain_minimum_version], [0.10])
++m4_define([champlain_minimum_version], [0.12])
+ m4_define([clutter_gtk_minimum_version], [0.90])
+ m4_define([geoclue_minimum_version], [0.11.1])
+ m4_define([gladeui_minimum_version], [3.10.0])
+@@ -1500,12 +1500,12 @@ if test "x$enable_contact_maps" = "xyes"
+ 		AC_MSG_ERROR([Clutter is required for maps in contacts. Use --with-clutter=yes to enable clutter.])
+ 	fi
+ 
+-	PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.10 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
++	PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.12 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
+ 	AC_SUBST(CHAMPLAIN_CFLAGS)
+ 	AC_SUBST(CHAMPLAIN_LIBS)
+ 
+ 	if test "x$have_champlain" = "xno"; then
+-		AC_MSG_ERROR([champlain-gtk-0.10 >= champlain_minimum_version is required for maps in contacts preview.])
++		AC_MSG_ERROR([champlain-gtk-0.12 >= champlain_minimum_version is required for maps in contacts preview.])
+ 	fi
+ 
+ 	PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no])
+--- evolution-3.1.92/widgets/misc/e-contact-map.c.wiget	2011-09-20 13:04:10.735525195 +0200
++++ evolution-3.1.92/widgets/misc/e-contact-map.c	2011-09-20 13:04:33.191856685 +0200
+@@ -42,7 +42,7 @@
+ #include <glib/gi18n.h>
+ #include <math.h>
+ 
+-G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_TYPE_CHAMPLAIN_EMBED)
++G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
+ 
+ struct _EContactMapPrivate {
+ 	GHashTable *markers; /* Hash table contact-name -> marker */
================================================================

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