Accepting request 101165 from GNOME:Factory

Pushing bits of G:F that are fine (mostly update to 3.3.4)

OBS-URL: https://build.opensuse.org/request/show/101165
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=98

evolution-data-server-3.3.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42a4f4d17698008cf2088a4b7fb0c9f8f2c58c0593f464ad6171f990cbedd72d
-size 3766788

evolution-data-server-3.3.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a163af36ab765884883902f4256ac6aa6a86c03dacd3c766eff83b17ad20e19f
+size 3823112

evolution-data-server-fix-introspection-build.patch

@@ -1,35 +0,0 @@
-From c92f1c0f25d8bb590c0ea9439a4b179df9159b7b Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 20 Dec 2011 13:27:54 -0500
-Subject: [PATCH] build: Use --include-uninstalled for internal .gir files
-
-Otherwise we end up with a dependency on an installed pkg-config file.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662888
----
- addressbook/libebook/Makefile.am |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
-index fce463e..602fbe0 100644
---- a/addressbook/libebook/Makefile.am
-+++ b/addressbook/libebook/Makefile.am
-@@ -85,7 +85,7 @@ if HAVE_INTROSPECTION
- introspection_sources = $(libebook_1_2_la_SOURCES)
- EBook-1.2.gir: libebook-1.2.la
- 
--EBook_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0 libxml2-2.0 \
-+EBook_1_2_gir_INCLUDES = GObject-2.0 GLib-2.0 libxml2-2.0 \
- 	Gio-2.0 \
- 	$(NULL)
- libxml_include = `$(PKG_CONFIG) --cflags libxml-2.0`
-@@ -100,6 +100,7 @@ EBook_1_2_gir_CFLAGS = $(INCLUDES) \
- 		       -I$(top_srcdir)/addressbook/libebook \
- 		       -I$(top_builddir)/addressbook/libebook \
- 			$(NULL)
-+EBook_1_2_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir
- EBook_1_2_gir_LIBS = \
- 	libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la
- EBook_1_2_gir_FILES = $(libebook_1_2_la_SOURCES) $(libebookinclude_HEADERS)
--- 
-1.7.6.4

evolution-data-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jan 16 17:51:52 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.3.4:
+  + Various code changes.
+  + Bugs fixed: bgo#357175, bgo#482171, bgo#592906, bgo#638810,
+    bgo#644817, bgo#661743, bgo#662888, bgo#665036, bgo#666327,
+    bgo#666327, bgo#666757, bgo#666770, bgo#667388, bgo#667698.
+  + Updated translations.
+- Drop evolution-data-server-fix-introspection-build.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Wed Dec 21 08:45:04 UTC 2011 - vuntz@opensuse.org
 

evolution-data-server.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package evolution-data-server
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@
 
 Name:           evolution-data-server
 %define _evo_version 3.4
-Version:        3.3.3
+Version:        3.3.4
 Release:        0
 Summary:        Evolution Data Server
 License:        LGPL-2.1+
@@ -40,8 +40,6 @@ Group:          Development/Libraries/GNOME
 Url:            http://www.gnome.org
 Source0:        http://download.gnome.org/sources/evolution-data-server/3.3/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM evolution-data-server-fix-introspection-build.patch bgo#662888 vuntz@opensuse.org -- Fix build of introspection data
-Patch0:         evolution-data-server-fix-introspection-build.patch
 BuildRequires:  bison
 BuildRequires:  db-devel
 %if %USE_EVOLDAP
@@ -256,7 +254,6 @@ This package contains developer documentation.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
 %{configure} \