From 3e0c365cae3efb830248ea7ef26eaad041c9d195 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Aug 05 2006 00:05:14 +0000 Subject: - Update to 2.7.90 - Require evolution-data-server-1.7.90.1. --- diff --git a/.cvsignore b/.cvsignore index d42406a..1ba3ac5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.4.tar.bz2 +evolution-2.7.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 92c2f13..dad2303 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,54 +1,50 @@ -%define gtkhtml_version 3.9.2 -%define soup_version 2.2.2 -%define eds_version 1.5.92 -%define use_mozilla_nss 1 -%define evo_major 2.8 -%define libbonoboui_version 2.4.2 -%define orbit2_version 2.9.8 -%define gnome_icon_theme_version 1.3.6 -%define libgnomeprint22_version 2.8.0 -%define dbus_version 0.90 %define dbus_glib_version 0.70 +%define dbus_version 0.90 +%define eds_version 1.7.90.1 +%define gnome_icon_theme_version 1.3.6 +%define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 +%define gtkhtml_version 3.9.2 %define last_libgal2_version 2:2.5.3-2 - +%define libbonoboui_version 2.4.2 +%define libgnomeprint22_version 2.8.0 +%define orbit2_version 2.9.8 %define pilot_link_version 2:0.11.8 -%define gnome_pilot_version 2.0.13 +%define redhat_menus_version 5.0.4 +%define soup_version 2.2.2 + +%define evo_major 2.8 +%define exchange_support 1 +%define inline_audio_support 0 %define ldap_support 1 +%define libnotify_support 1 %define krb5_support 1 -%ifarch s390 s390x -%define pilot_support 0 -%else -%define pilot_support 1 -%endif -# note that nntp is non-functional in evo 1.3.x %define nntp_support 1 -%define exchange_support 1 - %ifnarch s390 s390x %define nm_support 1 %else %define nm_support 0 %endif - -%define libnotify_support 1 -%define inline_audio_support 0 +%ifarch s390 s390x +%define pilot_support 0 +%else +%define pilot_support 1 +%endif +%define use_mozilla_nss 1 # Upstream tarballs often contain instances of undeclared functions; these tend # to work on i386 but fail on 64-bit architectures. Leave this on to trap the # warnings as errors (and ideally get the flag into the upstream build): %define require_function_declarations 0 -%define redhat_menus_version 5.0.4 - %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins ### Abstract ### Name: evolution -Version: 2.7.4 -Release: 5 +Version: 2.7.90 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -637,6 +633,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Aug 4 2006 Matthew Barnes - 2.7.90-1 +- Update to 2.7.90 +- Require evolution-data-server-1.7.90.1. + * Wed Aug 2 2006 Matthew Barnes - 2.7.4-5 - Remove patch for RH bug #167157, as it fixed it the wrong way. - The real fix for #167157 is in evolution-data-server-1.7.4-5. diff --git a/sources b/sources index 30619cb..ef87e32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2 +aae1aac8c521aef1aa9dbb1aed9a9f6e evolution-2.7.90.tar.bz2