Author: kiesiu Date: Sat Jun 23 11:05:40 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.4.3 - updated BuildRequires and Requires versions - patched to build with automake 1.12
---- Files affected: packages/evolution: evolution.spec (1.306 -> 1.307) , automake-1.12.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/evolution/evolution.spec diff -u packages/evolution/evolution.spec:1.306 packages/evolution/evolution.spec:1.307 --- packages/evolution/evolution.spec:1.306 Thu May 17 13:43:00 2012 +++ packages/evolution/evolution.spec Sat Jun 23 13:05:35 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.4.2 +Version: 3.4.3 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.4/%{name}-%{version}.tar.xz -# Source0-md5: e161138610416bfff07e6e0a1d9e4781 +# Source0-md5: 11ee7f83fb88610a1e016937733c43bf Source1: %{name}-gg16.png Source2: %{name}-gg48.png Source3: %{name}-addressbook.desktop @@ -25,6 +25,7 @@ Source6: %{name}-tasks.desktop Patch0: %{name}-nolibs.patch Patch1: %{name}-gnome-icon-theme.patch +Patch2: automake-1.12.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-gtk-devel >= 0.90 BuildRequires: dbus-glib-devel BuildRequires: docbook-dtd412-xml -BuildRequires: evolution-data-server-devel >= 3.4.2 +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: geoclue-devel >= 0.12.0 BuildRequires: gettext-devel >= 0.18.1 BuildRequires: glib2-devel >= 1:2.30.0 @@ -91,7 +92,7 @@ Requires: %{name}-component = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: GConf2 >= 2.28.0 -Requires: evolution-data-server >= 3.4.2 +Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= 3.2.0 Requires: gtkhtml >= 4.4.1 Requires: hicolor-icon-theme @@ -124,7 +125,7 @@ Summary: Evolution libraries Summary(pl.UTF-8): Biblioteki Evolution Group: X11/Libraries -Requires: glib2 >= 1:2.28.0 +Requires: glib2 >= 1:2.30.0 %description libs This package contains Evolution libraries. @@ -141,7 +142,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: GConf2-devel >= 2.28.0 Requires: cyrus-sasl-devel -Requires: evolution-data-server-devel >= 3.4.1 +Requires: evolution-data-server-devel >= %{version} Requires: glib2-devel >= 1:2.30.0 Requires: gnome-desktop-devel >= 3.2.0 Requires: gtk+3-devel >= 3.2.0 @@ -263,6 +264,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__gnome_doc_prepare} @@ -828,6 +830,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.307 2012/06/23 11:05:35 kiesiu +- updated to 3.4.3 +- updated BuildRequires and Requires versions +- patched to build with automake 1.12 + Revision 1.306 2012/05/17 11:43:00 kiesiu - updated to 3.4.2 ================================================================ Index: packages/evolution/automake-1.12.patch diff -u /dev/null packages/evolution/automake-1.12.patch:1.1 --- /dev/null Sat Jun 23 13:05:40 2012 +++ packages/evolution/automake-1.12.patch Sat Jun 23 13:05:35 2012 @@ -0,0 +1,20 @@ +diff -uNr evolution-3.4.3.orig/configure.ac evolution-3.4.3/configure.ac +--- evolution-3.4.3.orig/configure.ac 2012-06-23 12:23:51.000000000 +0200 ++++ evolution-3.4.3/configure.ac 2012-06-23 12:32:46.082934664 +0200 +@@ -23,11 +23,15 @@ + dnl Autoconf / Automake Initialization + AC_PREREQ(2.58) + AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) +-AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wall foreign]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS(config.h) + AC_CONFIG_SRCDIR(README) + ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ + dnl This is for the autoconf tests only - it set's the language we use + AC_LANG(C) + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/evolution/evolution.spec?r1=1.306&r2=1.307 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
