diff --git a/.cvsignore b/.cvsignore index 04a10b2..7d4ea4d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-1.5.92.2.tar.bz2 +evolution-1.5.93.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 6351afe..35c0181 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,10 +1,10 @@ # no ppc64 mozilla ExcludeArch: ppc64 -%define gal_version 2:2.1.13 +%define gal_version 2:2.1.14 %define gtkhtml_version 3.3.0 -%define soup_version 2.1.12 -%define eds_version 0.0.97 +%define soup_version 2.1.13 +%define eds_version 0.0.98 %define use_mozilla_nss 1 %define evo_major 1.5 %define libbonoboui_version 2.4.2 @@ -31,8 +31,8 @@ ExcludeArch: ppc64 %define nntp_support 1 Name: evolution -Version: 1.5.92.2 -Release: 2 +Version: 1.5.93 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -58,8 +58,8 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch # evolution-wombat but it does work to fix the problem #Patch500: evolution-wombat-sm.patch -# Patches to use GNOME 2.6 -Patch700: evolution-1.5.9.1-filechooser.patch +# This was added upstream in 1.5.93, with configure-time detection +#Patch700: evolution-1.5.9.1-filechooser.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -161,8 +161,7 @@ Development files needed for building things which link against evolution. #patch500 -p0 -b .wombatsm -# Patch disabled for now -%patch700 -p1 -b .filechooser +#patch700 -p1 -b .filechooser mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -220,6 +219,7 @@ fi --enable-file-locking=fcntl --enable-dot-locking=no \ --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ + --enable-file-chooser=yes \ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags export tagname=CC make LIBTOOL=%{_bindir}/libtool @@ -314,6 +314,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*/*.a %changelog +* Mon Aug 16 2004 David Malcolm - 1.5.93-1 +- updated tarball from 1.5.92.2 to 1.5.93 +- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain. +- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14 +- updated dependency on libsoup from 2.1.12 to 2.1.13 +- updated dependency on e-d-s from 0.0.97 to 0.0.98 + * Wed Aug 11 2004 David Malcolm - 1.5.92.2-2 - Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place diff --git a/sources b/sources index b6d8af3..573e11a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bead4c65cd147e678648cc6c6ab262e7 evolution-1.5.92.2.tar.bz2 +a01dc293bca189461f6cbd61b0a5a0ee evolution-1.5.93.tar.bz2