diff --git a/.gitignore b/.gitignore index 3cf7936..86b9f07 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.4.0.tar.xz /evolution-3.4.0.1.tar.xz /evolution-3.4.1.tar.xz +/evolution-3.5.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 2b793dc..171cfcf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,10 +10,11 @@ %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.4 +%define evo_base_version 3.6 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 +%define last_evo_nm_version 3.4.3 %define inline_audio_support 1 %define ldap_support 1 @@ -26,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -37,6 +38,7 @@ Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} +Obsoletes: evolution-NetworkManager <= %{last_evo_nm_version} ### Patches ### @@ -59,7 +61,6 @@ Requires: gvfs ### Build Dependencies ### BuildRequires: GConf2-devel -BuildRequires: NetworkManager-devel BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -159,16 +160,6 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. -%package NetworkManager -Group: Applications/Productivity -Summary: NetworkManager plugin for Evolution -Requires: %{name} = %{version}-%{release} -Requires: NetworkManager - -%description NetworkManager -This package contains the plugin to monitor network availability using -NetworkManager. - %package spamassassin Group: Applications/Productivity Summary: SpamAssassin plugin for Evolution @@ -552,10 +543,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so -%files NetworkManager -%defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-network-manager.so - %files spamassassin %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so @@ -572,6 +559,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Apr 29 2012 Matthew Barnes - 3.5.1-1 +- Update to 3.5.1 + * Tue Apr 24 2012 Kalev Lember - 3.4.1-2 - Silence rpm scriptlet output diff --git a/sources b/sources index d1b7cb1..2033be7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d178b6a9869f92e66b2022d4e35077ee evolution-3.4.1.tar.xz +a97349ce6ef3e7f3b0262fc104ccaf61 evolution-3.5.1.tar.xz