[evolution-data-server] 3.1.3

[Matthew Barnes]

commit 9b3c552d00ea8c4848c8c1b12982f551b5381034
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Mon Jul 4 17:30:49 2011 -0400

    3.1.3

 .gitignore                                     |    1 +
 evolution-data-server-3.1.2-libgdata_0_9.patch |  273 ------------------------
 evolution-data-server.spec                     |   43 ++--
 sources                                        |    2 +-
 4 files changed, 25 insertions(+), 294 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3a305e..7dfae39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-3.0.0.tar.bz2
 /evolution-data-server-3.1.1.tar.bz2
 /evolution-data-server-3.1.2.tar.bz2
+/evolution-data-server-3.1.3.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index ec495a5..5e64a19 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -8,16 +8,15 @@
 %define gtk3_version 3.0.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
-%define libgdata_version 0.7.0
+%define libgdata_version 0.9.1
 %define libgweather_version 2.91.0
 %define libical_version 0.46
+%define liboauth_version 0.9.4
 %define soup_version 2.3.0
 %define sqlite_version 3.5
 
 %define eds_base_version 3.2
 
-%define use_gnome_keyring 1
-
 %define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
 %define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
 %define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
@@ -25,7 +24,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.1.2
+Version: 3.1.3
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -42,8 +41,6 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch12: evolution-data-server-3.1.2-libgdata_0_9.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -52,17 +49,17 @@ BuildRequires: db4-devel
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
+BuildRequires: gnome-keyring-devel
+BuildRequires: gnome-online-accounts-devel
 BuildRequires: gnutls-devel
 BuildRequires: gperf
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: intltool >= %{intltool_version}
-%if %{use_gnome_keyring}
-BuildRequires: gnome-keyring-devel
-%endif
 BuildRequires: libgdata-devel >= %{libgdata_version}
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libical-devel >= %{libical_version}
+BuildRequires: liboauth-devel >= %{liboauth_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool
 BuildRequires: nspr-devel
@@ -97,12 +94,12 @@ Summary: Development files for building against %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-glib-devel
-%if %{use_gnome_keyring}
 Requires: gnome-keyring-devel
-%endif
+Requires: gnome-online-accounts-devel
 Requires: libgdata-devel
 Requires: libgweather-devel
 Requires: libical-devel
+Requires: liboauth-devel
 Requires: libsoup-devel
 Requires: sqlite-devel
 
@@ -121,7 +118,6 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch11 -p1 -b .fix-64bit-acinclude
-%patch12 -p1 -b .libgdata_0_9
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -179,12 +175,6 @@ if ! pkg-config --exists nss; then
   exit 1
 fi
 
-%if %{use_gnome_keyring}
-%define keyring_flags --enable-gnome-keyring
-%else
-%define keyring_flags --disable-gnome-keyring
-%endif
-
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
 
@@ -205,9 +195,15 @@ autoconf
 	--enable-dot-locking=no \
 	--enable-gtk-doc \
 	%ldap_flags %krb5_flags %nntp_flags %ssl_flags \
-	%largetfile_flags %keyring_flags
+	%largetfile_flags
 export tagname=CC
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+# Do not build in parallel. The libedata-book and libedata-cal directories
+# each produce a shared library and an executable binary that links to the
+# shared library. If the executable binary finishes first the build fails.
+# There may be other similar cases in the source tree.
+#make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -337,6 +333,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jul 04 2011 Matthew Barnes <mbarnes at redhat.com> - 3.1.3-1
+- Update to 3.1.3
+- Remove patch for libgdata-0.9.0 (fixed upstream).
+- Disable SMP flags; some source directories are racy.
+- Remove keyring option; gnome-keyring is mandatory now.
+- Add BR: gnome-online-accounts-devel and liboauth-devel
+
 * Tue Jun 14 2011 Milan Crha <mcrha at redhat.com> - 3.1.2-1
 - Update to 3.1.2
 - Add patch by Philip Withnall to build against libgdata-0.9.0
diff --git a/sources b/sources
index 55689fa..beb53d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c77886b37ff7ae0410339287ca60a5f8  evolution-data-server-3.1.2.tar.bz2
+0b65f4452692a968e1de1bedfdbf1355  evolution-data-server-3.1.3.tar.bz2