- Remove patches for Gnome.org bug #309079 (rejected upstream).

- One of these patches was causing RH bug #167157.
- No longer packaging unused patches.

evolution-data-server.spec

@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.4
-Release: 3
+Release: 5.test.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -36,18 +36,14 @@ Patch10: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
 Patch11: evolution-1.4.4-ldap-x86_64-hack.patch
 Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
-
-# Leak fixes by Mark G. Adams
-Patch14: gb-309079-attach-48376.patch
-Patch15: gb-309079-attach-48377.patch
-
-Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
+Patch14: evolution-data-server-1.5.4-make_imap4_optional.patch
 
 # Gnome.org bug #344693
-Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+Patch15: evolution-data-server-1.7.4-with-libdb-fix.patch
 
 # Gnome.org bug #348725
-#Patch18: evolution-data-server-1.7.90.1-missing-function-decl.patch
+# Getting ahead of ourselves... reenable on upgrade.
+#Patch16: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -85,6 +81,7 @@ BuildRequires: nss-devel
 %else
 BuildRequires: openssl-devel
 %endif
+
 %if %{use_gtk_doc}
 BuildRequires: gtk-doc
 %endif
@@ -128,11 +125,9 @@ evolution-data-server.
 %patch11 -p1 -b .ldaphack
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
-%patch14 -p0 -b .fix-uid-leak
-%patch15 -p0 -b .fix-comp-ref-leak
-%patch16 -p1 -b .make_imap4_optional
-%patch17 -p1 -b .with-libdb-fix
-#%patch18 -p1 -b .missing-function-decl
+%patch14 -p1 -b .make_imap4_optional
+%patch15 -p1 -b .with-libdb-fix
+#patch16 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -335,6 +330,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Thu Aug  3 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.4-4
+- Remove patches for Gnome.org bug #309079 (rejected upstream).
+- One of these patches was causing RH bug #167157.
+- No longer packaging unused patches.
+
 * Mon Jul 31 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.4-3
 - Revert to version 1.7.4 to prevent API/ABI breakage.
 - Add back patch to make --with-libdb configure option work.