From 90a8e232fb3fa68196ad0bd63b4cbcc36c948fba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Wed, 17 May 2006 16:16:28 +0000
Subject: [PATCH] - Update to 1.7.2 - Remove
 evolution-data-server-1.7.1-nss_auto_detect.patch; in upstream     now.

---
 .cvsignore                 |  2 +-
 evolution-data-server.spec | 16 +++++++---------
 sources                    |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5fb930e..a046917 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.7.1.tar.bz2
+evolution-data-server-1.7.2.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index ae0428e..c6d801f 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -20,11 +20,11 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.7.1
-Release: 2
+Version: 1.7.2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 #Patch1: evolution-data-server-1.0.2-fix-64-bit-build.patch
 #Patch2: fix_contact_leaks.patch
 Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
@@ -47,9 +47,6 @@ Patch201: gb-309079-attach-48377.patch
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-# Temporary upstream patch to make SSL work again.
-Patch301: evolution-data-server-1.7.1-nss_auto_detect.patch
-
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -76,7 +73,6 @@ BuildRequires: openssl-devel
 BuildRequires: gtk-doc
 %endif
 
-
 %if %{ldap_support}
 %if %{static_ldap}
 BuildRequires: openldap-evolution-devel
@@ -125,7 +121,6 @@ evolution-data-server.
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
-%patch301 -p1 -b .nss_auto_detect
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -200,7 +195,6 @@ intltoolize --force
 # Rerun autoconf since we patched configure.in:
 autoconf
 
-
 %configure \
   %gtkdoc_flags \
   --enable-file-locking=fcntl --enable-dot-locking=no \
@@ -323,6 +317,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 17 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.2
+- Update to 1.7.2
+- Remove evolution-data-server-1.7.1-nss_auto_detect.patch; in upstream now.
+
 * Sun May 14 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.1-2
 - Add temporary patch evolution-data-server-1.7.1-nss_auto_detect.patch
   to help `configure' detect the SSL modules (closes #191567).
diff --git a/sources b/sources
index 8620b86..d0ea110 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80addd969d9f5c60add348df8d98423e  evolution-data-server-1.7.1.tar.bz2
+ccd8cd291cdea417b4d3ae19363cc4c5  evolution-data-server-1.7.2.tar.bz2