- updated to 3.4.3

- updated BuildRequires and Requires versions
- patched to build with automake 1.12

Changed files:
    automake-1.12.patch -> 1.1
    evolution.spec -> 1.307

diff --git a/automake-1.12.patch b/automake-1.12.patch
new file mode 100644 (file)
index 0000000..345a628
--- /dev/null
+++ b/automake-1.12.patch
@@ -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)
+ 

diff --git a/evolution.spec b/evolution.spec
index 6d7381c36d61619025d1b1ee68bb54e2806c9d23..d5ce75ac9417b4048941172e23bd5531f828efa6 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -10,12 +10,12 @@ Summary(pl.UTF-8):  Klient poczty dla GNOME/Kalendarz/Książka Adresowa
 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
@@ -24,6 +24,7 @@ Source5:      %{name}-mail.desktop
 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
@@ -36,7 +37,7 @@ BuildRequires:        clutter-devel >= 1.0.0
 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
@@ -90,7 +91,7 @@ Requires(post,preun): GConf2
 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
@@ -123,7 +124,7 @@ ferramentas interessantes.
 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.
@@ -140,7 +141,7 @@ Group:              X11/Development/Libraries
 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
@@ -262,6 +263,7 @@ Dokumentacja API Evolution.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gnome_doc_prepare}