diff --git a/.cvsignore b/.cvsignore index 463f549..9fcd67e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-1.5.8.tar.bz2 +evolution-1.5.9.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 173ad27..9fc1725 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,13 +1,14 @@ # no ppc64 mozilla ExcludeArch: ppc64 -%define gal_version 2:2.1.9 -%define gtkhtml_version 3.1.14 -%define soup_version 2.1.9 -%define eds_version 0.0.93 +%define gal_version 2:2.1.10 +%define gtkhtml_version 3.1.16 +%define soup_version 2.1.11 +%define eds_version 0.0.94 %define use_mozilla_nss 1 %define evo_major 1.5 %define libbonoboui_version 2.4.2 +%define orbit2_version 2.9.8 %if %{use_mozilla_nss} %define mozilla_version 1.6 @@ -24,7 +25,7 @@ ExcludeArch: ppc64 %define nntp_support 1 Name: evolution -Version: 1.5.8 +Version: 1.5.9.1 Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -52,7 +53,7 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch #Patch500: evolution-wombat-sm.patch # Patches to use GNOME 2.6 -Patch700: evolution-1.5.7-filechooser.patch +Patch700: evolution-1.5.9.1-filechooser.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -71,6 +72,8 @@ Requires: evolution-data-server >= %{eds_version} Requires: gnome-spell >= 1.0.2 Requires: gtk2 >= 2.4.0 Requires: libbonoboui >= %{libbonoboui_version} +Requires: ORBit2 >= %{orbit2_version} +Requires: spamassassin BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: libgal2-devel >= %{gal_version} @@ -84,6 +87,7 @@ BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libxml2-devel BuildRequires: GConf2-devel BuildRequires: intltool +BuildRequires: ORBit2-devel >= %{orbit2_version} # kind of silly... BuildRequires: flex bison byacc libtool gettext @@ -296,6 +300,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*/*.a %changelog +* Mon Jun 7 2004 David Malcolm - 1.5.9.1-2 +- updated filechooser patch again + +* Mon Jun 7 2004 David Malcolm - 1.5.9.1-1 +- 1.5.9.1; updated filechooser patch + +* Wed May 26 2004 David Malcolm - 1.5.8-3 +- added ORBit2 and spamassassin requirements + * Mon May 24 2004 David Malcolm - 1.5.8-2 - Fixed up filechooser patch and re-enabled it diff --git a/sources b/sources index de35991..40c1694 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a09ca19c5d2bbe332c2bd493b1e9328b evolution-1.5.8.tar.bz2 +f075b47071c81950258d51aef50cc657 evolution-1.5.9.1.tar.bz2