From ca3b1b93d86483d6f11b9ddff4c332d629009be1 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Nov 18 2010 17:15:34 +0000
Subject: - Update to 2.32.2.

- Drop ca-certs patch. Fixed upstream.

---

diff --git a/.gitignore b/.gitignore
index cb5d3c5..9172582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ empathy-2.31.5.1.tar.bz2
 /empathy-2.32.0.tar.bz2
 /empathy-2.32.0.1.tar.bz2
 /empathy-2.32.1.tar.bz2
+/empathy-2.32.2.tar.bz2
diff --git a/0001-Make-ca-certs-location-configurable-634197.patch b/0001-Make-ca-certs-location-configurable-634197.patch
deleted file mode 100644
index c797df0..0000000
--- a/0001-Make-ca-certs-location-configurable-634197.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urp empathy-2.32.1.OLD/configure.ac empathy-2.32.1/configure.ac
---- empathy-2.32.1.OLD/configure.ac	2010-11-15 08:33:45.000000000 -0500
-+++ empathy-2.32.1/configure.ac	2010-11-15 09:27:10.641489002 -0500
-@@ -214,6 +214,38 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
- AM_GLIB_GNU_GETTEXT
- 
- # -----------------------------------------------------------
-+# Make CA certificates path configurable
-+# Stolen from GIO's TLS
-+# -----------------------------------------------------------
-+AC_MSG_CHECKING([location of system Certificate Authority list])
-+AC_ARG_WITH(ca-file,
-+            [AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
-+                            [path to system Certificate Authority list])])
-+if test "$with_ca_file" = "no"; then
-+    AC_MSG_RESULT([disabled])
-+else
-+    if test -z "$with_ca_file"; then
-+        for f in /etc/pki/tls/certs/ca-bundle.crt \
-+                 /etc/ssl/certs/ca-certificates.crt; do
-+            if test -f "$f"; then
-+                with_ca_file="$f"
-+            fi
-+        done
-+        if test -z "$with_ca_file"; then
-+            AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
-+        fi
-+    fi
-+
-+    AC_MSG_RESULT($with_ca_file)
-+    if ! test -f "$with_ca_file"; then
-+        AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
-+    fi
-+    GTLS_SYSTEM_CA_FILE="$with_ca_file"
-+
-+    AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
-+fi
-+
-+# -----------------------------------------------------------
- # Connectivity integration
- # -----------------------------------------------------------
- AC_ARG_WITH(connectivity,
-@@ -511,6 +543,7 @@ Configure summary:
- 	Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
- 	Prefix......................:  ${prefix}
- 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
-+	CA Cert Path................:  ${GTLS_SYSTEM_CA_FILE}
- 
-     Features:
- 	Spell checking (enchant)....:  ${have_enchant}
-diff -urp empathy-2.32.1.OLD/libempathy/empathy-tls-verifier.c empathy-2.32.1/libempathy/empathy-tls-verifier.c
---- empathy-2.32.1.OLD/libempathy/empathy-tls-verifier.c	2010-11-15 08:05:32.000000000 -0500
-+++ empathy-2.32.1/libempathy/empathy-tls-verifier.c	2010-11-15 09:28:17.603489002 -0500
-@@ -44,7 +44,7 @@ enum {
- };
- 
- static const gchar* system_ca_paths[] = {
--  "/etc/ssl/certs/ca-certificates.crt",
-+  GTLS_SYSTEM_CA_FILE,
-   NULL,
- };
- 
diff --git a/empathy.spec b/empathy.spec
index 265c6ca..a61d793 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -11,7 +11,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.32.1
+Version:	2.32.2
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -21,7 +21,6 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
-Patch0:		0001-Make-ca-certs-location-configurable-634197.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -84,7 +83,6 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ssl
 # force this to be regenerated
 rm data/empathy.desktop
 autoreconf
@@ -162,6 +160,10 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Thu Nov 18 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.32.2-1
+- Update to 2.32.2.
+- Drop ca-certs patch. Fixed upstream.
+
 * Mon Nov 15 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.32.1-1
 - Update to 2.32.1.
 - Remove gtk3 configure flag since it's been dropped upstream.
diff --git a/sources b/sources
index 0478885..1e418d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09e7d72cd58a5f776b5097e7d5596095  empathy-2.32.1.tar.bz2
+f7ea7ca2481c555a172930342051a20a  empathy-2.32.2.tar.bz2