diff --git a/.gitignore b/.gitignore index 2519a4d..cb5d3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ empathy-2.31.5.1.tar.bz2 /empathy-2.31.92.tar.bz2 /empathy-2.32.0.tar.bz2 /empathy-2.32.0.1.tar.bz2 +/empathy-2.32.1.tar.bz2 diff --git a/0001-Make-ca-certs-location-configurable-634197.patch b/0001-Make-ca-certs-location-configurable-634197.patch index 10f3d3f..c797df0 100644 --- a/0001-Make-ca-certs-location-configurable-634197.patch +++ b/0001-Make-ca-certs-location-configurable-634197.patch @@ -1,13 +1,10 @@ -diff -urp empathy-2.32.0.1.OLD/configure.ac empathy-2.32.0.1/configure.ac ---- empathy-2.32.0.1.OLD/configure.ac 2010-10-04 09:54:03.000000000 -0400 -+++ empathy-2.32.0.1/configure.ac 2010-11-06 22:00:06.884066741 -0400 -@@ -244,6 +244,40 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET - +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 +# ----------------------------------------------------------- @@ -39,20 +36,21 @@ diff -urp empathy-2.32.0.1.OLD/configure.ac empathy-2.32.0.1/configure.ac + AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list]) +fi + - # ----------------------------------------------------------- ++# ----------------------------------------------------------- # Connectivity integration # ----------------------------------------------------------- -@@ -565,6 +599,7 @@ Configure summary: + AC_ARG_WITH(connectivity, +@@ -511,6 +543,7 @@ Configure summary: + Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} - Use GTK+3...................: ${have_gtk3} + CA Cert Path................: ${GTLS_SYSTEM_CA_FILE} Features: Spell checking (enchant)....: ${have_enchant} -diff -urp empathy-2.32.0.1.OLD/libempathy/empathy-tls-verifier.c empathy-2.32.0.1/libempathy/empathy-tls-verifier.c ---- empathy-2.32.0.1.OLD/libempathy/empathy-tls-verifier.c 2010-10-04 07:02:06.000000000 -0400 -+++ empathy-2.32.0.1/libempathy/empathy-tls-verifier.c 2010-11-06 22:00:53.121066742 -0400 +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 { }; diff --git a/empathy.spec b/empathy.spec index 5d395c3..265c6ca 100644 --- a/empathy.spec +++ b/empathy.spec @@ -11,8 +11,8 @@ %global libchamplain_version 0.4 Name: empathy -Version: 2.32.0.1 -Release: 3%{?dist} +Version: 2.32.1 +Release: 1%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -92,7 +92,7 @@ autoreconf %build ## GCC complains about some unused functions, so we forcibly show those as ## simple warnings instead of build-halting errors. -%configure --disable-static --enable-gtk3=no +%configure --disable-static ## RPATHs are yucky. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -162,6 +162,11 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %changelog +* Mon Nov 15 2010 Brian Pepple - 2.32.1-1 +- Update to 2.32.1. +- Remove gtk3 configure flag since it's been dropped upstream. +- Rebase ca-certs patch. + * Sat Nov 6 2010 Brian Pepple - 2.32.0.1-3 - Add patch to use Fedora's CA-cert. diff --git a/sources b/sources index 1e0f5b6..0478885 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1cef619e9ab0aace7439884446819cf empathy-2.32.0.1.tar.bz2 +09e7d72cd58a5f776b5097e7d5596095 empathy-2.32.1.tar.bz2