diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 4c26c4f..4fe4993 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -27,7 +27,7 @@ ExcludeArch: ppc64 Summary: Backend data server for evolution Name: evolution-data-server Version: 1.2.0 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -40,6 +40,7 @@ Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch #Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch Patch98: evolution-1.4.4-ldap-x86_64-hack.patch +Patch100: evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch BuildRoot: %{_tmppath}/%{name}-root Requires: libsoup >= %{soup_version} @@ -110,6 +111,7 @@ evolution-data-server. #%patch6 -p0 -b .calendar-optimisation-XB70267 %patch98 -p1 -b .ldaphack +%patch100 -p1 -b .cope-with-a-macro-called-read mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -209,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 8 2005 David Malcolm - 1.2.0-2 +- Added a patch to deal with glibc defining a macro called "read" + * Tue Mar 8 2005 David Malcolm - 1.2.0-1 - 1.2.0 - Removed patch for GCC 4 as this is now in upstream tarball