From d199cea33584444d9f303936f34782b7281a6185f24acb58b9fd6da5254ba2a8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Jul 2011 09:19:49 +0000 Subject: [PATCH] Accepting request 75446 from home:vuntz:branches:GNOME:Factory Update to 3.1.3 OBS-URL: https://build.opensuse.org/request/show/75446 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=98 --- baselibs.conf | 4 ++-- evolution-data-server-3.1.2.tar.bz2 | 3 --- evolution-data-server-3.1.3.tar.bz2 | 3 +++ evolution-data-server-fix-vala.patch | 13 ------------- evolution-data-server.changes | 29 ++++++++++++++++++++++++++++ evolution-data-server.spec | 20 +++++++++---------- 6 files changed, 44 insertions(+), 28 deletions(-) delete mode 100644 evolution-data-server-3.1.2.tar.bz2 create mode 100644 evolution-data-server-3.1.3.tar.bz2 delete mode 100644 evolution-data-server-fix-vala.patch diff --git a/baselibs.conf b/baselibs.conf index 0ec408c..9b91790 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,8 @@ -libcamel-1_2-26 +libcamel-1_2-27 libebackend-1_2-1 libebook-1_2-11 libecal-1_2-9 libedata-book-1_2-10 libedata-cal-1_2-12 libedataserver-1_2-14 -libedataserverui-3_0-0 +libedataserverui-3_0-1 diff --git a/evolution-data-server-3.1.2.tar.bz2 b/evolution-data-server-3.1.2.tar.bz2 deleted file mode 100644 index d28eda3..0000000 --- a/evolution-data-server-3.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd3bc8dd3d24c2256074cfae016de67db629838715fba5c3e8eab05805413bd9 -size 4458271 diff --git a/evolution-data-server-3.1.3.tar.bz2 b/evolution-data-server-3.1.3.tar.bz2 new file mode 100644 index 0000000..b95887a --- /dev/null +++ b/evolution-data-server-3.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d290ae08c974c842c9cb6b0f365f32726138448f912fb42bd1a90b5f7cd35a2 +size 4473533 diff --git a/evolution-data-server-fix-vala.patch b/evolution-data-server-fix-vala.patch deleted file mode 100644 index d680e7c..0000000 --- a/evolution-data-server-fix-vala.patch +++ /dev/null @@ -1,13 +0,0 @@ -commit be8827d105122c00b0f23d513b36a24e185adcdb -Author: Raul Gutierrez Segales -Date: Tue Jun 28 08:05:47 2011 +0100 - - Vala bindings: we depend on gio-2.0 - -diff --git a/vala/libebook-1.2.deps b/vala/libebook-1.2.deps -index 1899619..4478fb0 100644 ---- a/vala/libebook-1.2.deps -+++ b/vala/libebook-1.2.deps -@@ -1 +1,2 @@ - libxml-2.0 -+gio-2.0 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 60d361c..5ac6930 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Jul 4 12:48:12 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.3: + + Add support for GNOME Online Accounts. + + Add OAuth support to Google Contacts backend. + + Fix LDAP authentication and process authentication requests on + idle + + SMTP: Handle 235 code after initial AUTH command. + + Make Camel's SASL framework more extensible. + + Fix few memory leaks + + Various other code changes. + + Code cleanups. + + Build fixes. + + Bugs fixed: bgo#650671, bgo#653476, bgo#650126, bgo#653385, + bgo#224687, bgo#224687, bgo#652173, bgo#648468, bgo#269413, + bgo#565961, bgo#652530. + + Updated translations. +- Add pkgconfig(goa-1.0) and pkgconfig(oauth) for the new GNOME + Online Accounts and OAuth support features. +- Drop evolution-data-server-fix-vala.patch: fixed upstream. +- Bump so_camel define to 27 to follow library soversion change. + This results in libcamel-1_2-26 being renamed to libcamel-1_2-27. +- Bump so_edataserverui define to 1 to follow library soversion + change. This results in libedataserverui-3_0-0 being renamed to + libedataserverui-3_0-1. +- Re-enable translation-update-upstream support. +- Disable parallel build as it is broken in this release. + ------------------------------------------------------------------- Fri Jul 1 11:33:33 CEST 2011 - vuntz@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 2cd0712..c5c0347 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -20,28 +20,26 @@ # Shared Library soNUMs, to make it easier for updates # When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 26 +%define so_camel 27 %define so_ebackend 1 %define so_ebook 11 %define so_ecal 9 %define so_edata_book 10 %define so_edata_cal 12 %define so_edataserver 14 -%define so_edataserverui 0 +%define so_edataserverui 1 Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.2 +Version: 3.1.3 Release: 1 -# FIXME: Re-enable translation-update-upstream if possible. +# FIXME: parallel build is broken in 3.1.3, check in later versions if this works Summary: Evolution Data Server Url: http://www.gnome.org -Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/evolution-data-server/3.1/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM evolution-data-server-fix-vala.patch vuntz@opensuse.org -- Fix build, taken from git -Patch0: evolution-data-server-fix-vala.patch BuildRequires: bison BuildRequires: db-devel %if %USE_EVOLDAP @@ -65,7 +63,9 @@ BuildRequires: libsoup-devel BuildRequires: mozilla-nss-devel BuildRequires: nss-shared-helper-devel BuildRequires: python-devel +BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(oauth) BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream BuildRequires: vala @@ -217,8 +217,7 @@ This package contains developer documentation. %lang_package %prep %setup -q -#translation-update-upstream -%patch0 -p1 +translation-update-upstream %build %{configure} \ @@ -235,7 +234,8 @@ This package contains developer documentation. --enable-nntp=yes \ --enable-vala-bindings \ --disable-static -%{__make} %{?_smp_mflags} V=1 +#make %{?_smp_mflags} V=1 +make %install %{makeinstall}